Permalink
Browse files

smtp: Fixed an issue with the multi-interface always sending postdata

Due to the result code being reset to CURLE_OK when smtp_dophase_done()
was called, postdata would incorrectly be sent to the server when the
MAIL FROM or RCPT command was rejected.

As such, libcurl would return the wrong result code from performing the
operation and additionally set CURLINFO_RESPONSE_CODE to be that
returned by the postdata command.

Bug: http://curl.haxx.se/mail/lib-2012-05/0108.html
Reported by: Gokhan Sengun
  • Loading branch information...
captain-caveman2k committed May 22, 2012
1 parent b1f081f commit ef60fdbd7367ea97446e7e2ed7ac91d411265431
Showing with 7 additions and 6 deletions.
  1. +7 −6 lib/smtp.c
View
@@ -1840,14 +1840,15 @@ static CURLcode smtp_dophase_done(struct connectdata *conn, bool connected)
/* called from multi.c while DOing */
static CURLcode smtp_doing(struct connectdata *conn, bool *dophase_done)
{
- CURLcode result;
- result = smtp_multi_statemach(conn, dophase_done);
-
- if(*dophase_done) {
- result = smtp_dophase_done(conn, FALSE /* not connected */);
+ CURLcode result = smtp_multi_statemach(conn, dophase_done);
+ if(result)
+ DEBUGF(infof(conn->data, "DO phase failed\n"));
+ else
DEBUGF(infof(conn->data, "DO phase is complete\n"));
- }
+
+ if(*dophase_done)
+ smtp_dophase_done(conn, FALSE /* not connected */);
return result;
}

0 comments on commit ef60fdb

Please sign in to comment.