generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

smtp: Fixed processing of more than one response when sent in same packet

Browse Source 
Added a loop to smtp_statemach_act() in which Curl_pp_readresp() is
called until the cache is drained. Without this multiple responses
received in a single packet could result in a hang or delay.
This commit is contained in:
Steve Holme
2013-11-15 10:54:47 +00:00
parent f16c0de4e9
commit 796333bc5e
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/smtp.c
View File

@@ -1352,16 +1352,19 @@ static CURLcode smtp_statemach_act(struct connectdata *conn)
if(pp->sendleft) if(pp->sendleft)
return Curl_pp_flushsend(pp); return Curl_pp_flushsend(pp);
/* Read the response from the server */ do {
result = Curl_pp_readresp(sock, pp, &smtpcode, &nread); /* Read the response from the server */
if(result) result = Curl_pp_readresp(sock, pp, &smtpcode, &nread);
return result; if(result)
return result;
/* Store the latest response for later retrieval */ /* Store the latest response for later retrieval if necessary */
if(smtpc->state != SMTP_QUIT && smtpcode != 1) if(smtpc->state != SMTP_QUIT && smtpcode != 1)
data->info.httpcode = smtpcode; data->info.httpcode = smtpcode;
if(!smtpcode)
break;
if(smtpcode) {
/* We have now received a full SMTP server response */ /* We have now received a full SMTP server response */
switch(smtpc->state) { switch(smtpc->state) {
case SMTP_SERVERGREET: case SMTP_SERVERGREET:
@@ -1453,7 +1456,7 @@ static CURLcode smtp_statemach_act(struct connectdata *conn)
state(conn, SMTP_STOP); state(conn, SMTP_STOP);
break; break;
} }
} } while(!result && smtpc->state != SMTP_STOP && Curl_pp_moredata(pp));
return result; return result;
} }