moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

smtp.c: Fixed an issue with writing postdata

Browse Source 
Fixed a problem in smtp_done() when writing out the postdata as
Curl_write() would periodically return zero bytes written.
This commit is contained in:
Steve Holme 2012-02-20 12:18:22 +00:00 committed by Daniel Stenberg
parent 30c44edad3
commit 2f1ad7d6e2
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/smtp.c
View File

@ -1035,6 +1035,7 @@ static CURLcode smtp_state_rcpt_resp(struct connectdata *conn,
/* send DATA */ /* send DATA */
result = Curl_pp_sendf(&conn->proto.smtpc.pp, "DATA"); result = Curl_pp_sendf(&conn->proto.smtpc.pp, "DATA");
if(result) if(result)
return result; return result;
@ -1392,9 +1393,6 @@ static CURLcode smtp_done(struct connectdata *conn, CURLcode status,
struct smtp_conn *smtpc = &conn->proto.smtpc; struct smtp_conn *smtpc = &conn->proto.smtpc;
struct pingpong *pp = &smtpc->pp; struct pingpong *pp = &smtpc->pp;
/* TODO: make this work even when the socket is EWOULDBLOCK in this
call! */
/* Send the end of block data */ /* Send the end of block data */
result = Curl_write(conn, result = Curl_write(conn,
conn->writesockfd, /* socket to send to */ conn->writesockfd, /* socket to send to */
@ -1402,7 +1400,19 @@ static CURLcode smtp_done(struct connectdata *conn, CURLcode status,
SMTP_EOB_LEN, /* buffer size */ SMTP_EOB_LEN, /* buffer size */
&bytes_written); /* actually sent away */ &bytes_written); /* actually sent away */
pp->response = Curl_tvnow(); /* timeout relative now */ if(result)
return result;
if(bytes_written != SMTP_EOB_LEN) {
/* The whole chunk was not sent so keep it around and adjust the
pingpong structure accordingly */
pp->sendthis = strdup(SMTP_EOB);
pp->sendsize = SMTP_EOB_LEN;
pp->sendleft = SMTP_EOB_LEN - bytes_written;
}
else
/* Successfully sent so adjust the response timeout relative to now */
pp->response = Curl_tvnow();
state(conn, SMTP_POSTDATA); state(conn, SMTP_POSTDATA);