diff options
author | Steve Holme <steve_holme@hotmail.com> | 2012-02-22 10:44:34 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2012-02-23 23:29:03 +0100 |
commit | 5430007222e0325a1c5e0359ecde43886cef61af (patch) | |
tree | a8753bb1968a2d05959242e35a9c2c0597da636e /lib/smtp.c | |
parent | 779fa13ef9e05f6d6cf865ecb113d236b114f72f (diff) |
SMTP: Added support for returning SMTP response codes
Set the conn->data->info.httpcode variable in smtp_statemach_act() to
allow Curl_getinfo() to return the SMTP response code via the
CURLINFO_RESPONSE_CODE action.
Diffstat (limited to 'lib/smtp.c')
-rw-r--r-- | lib/smtp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index b0b4d1aaa..381e3e240 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -1108,6 +1108,10 @@ static CURLcode smtp_statemach_act(struct connectdata *conn) if(result) return result; + if(smtpc->state != SMTP_QUIT) + /* store the latest code for later retrieval */ + data->info.httpcode = smtpcode; + if(smtpcode) { /* we have now received a full SMTP server response */ switch(smtpc->state) { @@ -1524,6 +1528,7 @@ static CURLcode smtp_quit(struct connectdata *conn) result = Curl_pp_sendf(&conn->proto.smtpc.pp, "QUIT"); if(result) return result; + state(conn, SMTP_QUIT); result = smtp_easy_statemach(conn); @@ -1564,7 +1569,6 @@ static CURLcode smtp_disconnect(struct connectdata *conn, /* This won't already be freed in some error cases */ Curl_safefree(smtpc->domain); - smtpc->domain = NULL; return CURLE_OK; } @@ -1581,8 +1585,7 @@ static CURLcode smtp_dophase_done(struct connectdata *conn, /* no data to transfer */ Curl_setup_transfer(conn, -1, -1, FALSE, NULL, -1, NULL); - free(smtpc->domain); - smtpc->domain = NULL; + Curl_safefree(smtpc->domain); return CURLE_OK; } |