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

email: Fixed QUIT / LOGOUT being sent when SSL connect fails

Browse Source
This commit is contained in:
Steve Holme
2013-10-18 19:28:20 +01:00
parent 86c64f3daf
commit ce61510127
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/imap.c
View File

@@ -1982,7 +1982,7 @@ static CURLcode imap_disconnect(struct connectdata *conn, bool dead_connection)
/* The IMAP session may or may not have been allocated/setup at this /* The IMAP session may or may not have been allocated/setup at this
point! */ point! */
if(!dead_connection && imapc->pp.conn) if(!dead_connection && imapc->pp.conn && imapc->pp.conn->bits.protoconnstart)
if(!imap_perform_logout(conn)) if(!imap_perform_logout(conn))
(void)imap_block_statemach(conn); /* ignore errors on LOGOUT */ (void)imap_block_statemach(conn); /* ignore errors on LOGOUT */

5
lib/pop3.c
View File

@@ -1634,8 +1634,7 @@ static CURLcode pop3_do(struct connectdata *conn, bool *done)
* Disconnect from an POP3 server. Cleanup protocol-specific per-connection * Disconnect from an POP3 server. Cleanup protocol-specific per-connection
* resources. BLOCKING. * resources. BLOCKING.
*/ */
static CURLcode pop3_disconnect(struct connectdata *conn, static CURLcode pop3_disconnect(struct connectdata *conn, bool dead_connection)
bool dead_connection)
{ {
struct pop3_conn *pop3c = &conn->proto.pop3c; struct pop3_conn *pop3c = &conn->proto.pop3c;
@@ -1645,7 +1644,7 @@ static CURLcode pop3_disconnect(struct connectdata *conn,
/* The POP3 session may or may not have been allocated/setup at this /* The POP3 session may or may not have been allocated/setup at this
point! */ point! */
if(!dead_connection && pop3c->pp.conn) if(!dead_connection && pop3c->pp.conn && pop3c->pp.conn->bits.protoconnstart)
if(!pop3_perform_quit(conn)) if(!pop3_perform_quit(conn))
(void)pop3_block_statemach(conn); /* ignore errors on QUIT */ (void)pop3_block_statemach(conn); /* ignore errors on QUIT */

5
lib/smtp.c
View File

@@ -1632,8 +1632,7 @@ static CURLcode smtp_do(struct connectdata *conn, bool *done)
* Disconnect from an SMTP server. Cleanup protocol-specific per-connection * Disconnect from an SMTP server. Cleanup protocol-specific per-connection
* resources. BLOCKING. * resources. BLOCKING.
*/ */
static CURLcode smtp_disconnect(struct connectdata *conn, static CURLcode smtp_disconnect(struct connectdata *conn, bool dead_connection)
bool dead_connection)
{ {
struct smtp_conn *smtpc = &conn->proto.smtpc; struct smtp_conn *smtpc = &conn->proto.smtpc;
@@ -1643,7 +1642,7 @@ static CURLcode smtp_disconnect(struct connectdata *conn,
/* The SMTP session may or may not have been allocated/setup at this /* The SMTP session may or may not have been allocated/setup at this
point! */ point! */
if(!dead_connection && smtpc->pp.conn) if(!dead_connection && smtpc->pp.conn && smtpc->pp.conn->bits.protoconnstart)
if(!smtp_perform_quit(conn)) if(!smtp_perform_quit(conn))
(void)smtp_block_statemach(conn); /* ignore errors on QUIT */ (void)smtp_block_statemach(conn); /* ignore errors on QUIT */