diff options
| author | Jiri Hruska <jirka@fud.cz> | 2013-09-10 20:40:11 +0200 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2013-09-10 19:47:54 +0100 |
| commit | 5c14a7f06864f20a62b1fd1961d30f1902e2280a (patch) | |
| tree | 077726f21df15b1dc42205c7b123e33805d24696 | |
| parent | 2879ffacfa0cf60a0e215d8b1300368390e7548f (diff) | |
imap/pop3/smtp: Speed up SSL connection initialization
Don't wait for the next callback call (usually 1 second) before
continuing with protocol specific connection initialization.
| -rw-r--r-- | RELEASE-NOTES | 1 | ||||
| -rw-r--r-- | lib/imap.c | 8 | ||||
| -rw-r--r-- | lib/pop3.c | 8 | ||||
| -rw-r--r-- | lib/smtp.c | 8 |
4 files changed, 16 insertions, 9 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 30aa95981..59310f224 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -42,6 +42,7 @@ This release includes the following bugfixes: o curl_easy_pause: suggest one way to unpause o imap: Fixed calculation of transfer when partial FETCH received [16] o pingpong: Check SSL library buffers for already read data [16] + o imap/pop3/smtp: Speed up SSL connection initialization This release includes the following known bugs: diff --git a/lib/imap.c b/lib/imap.c index 17e9eb0b0..6a3b36449 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -1704,11 +1704,13 @@ static CURLcode imap_multi_statemach(struct connectdata *conn, bool *done) CURLcode result = CURLE_OK; struct imap_conn *imapc = &conn->proto.imapc; - if((conn->handler->flags & PROTOPT_SSL) && !imapc->ssldone) + if((conn->handler->flags & PROTOPT_SSL) && !imapc->ssldone) { result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &imapc->ssldone); - else - result = Curl_pp_statemach(&imapc->pp, FALSE); + if(result || !imapc->ssldone) + return result; + } + result = Curl_pp_statemach(&imapc->pp, FALSE); *done = (imapc->state == IMAP_STOP) ? TRUE : FALSE; return result; diff --git a/lib/pop3.c b/lib/pop3.c index 5b49b1af7..f33b189d1 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -1368,11 +1368,13 @@ static CURLcode pop3_multi_statemach(struct connectdata *conn, bool *done) CURLcode result = CURLE_OK; struct pop3_conn *pop3c = &conn->proto.pop3c; - if((conn->handler->flags & PROTOPT_SSL) && !pop3c->ssldone) + if((conn->handler->flags & PROTOPT_SSL) && !pop3c->ssldone) { result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &pop3c->ssldone); - else - result = Curl_pp_statemach(&pop3c->pp, FALSE); + if(result || !pop3c->ssldone) + return result; + } + result = Curl_pp_statemach(&pop3c->pp, FALSE); *done = (pop3c->state == POP3_STOP) ? TRUE : FALSE; return result; diff --git a/lib/smtp.c b/lib/smtp.c index 7ba2ba464..2d4055c24 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -1392,11 +1392,13 @@ static CURLcode smtp_multi_statemach(struct connectdata *conn, bool *done) CURLcode result = CURLE_OK; struct smtp_conn *smtpc = &conn->proto.smtpc; - if((conn->handler->flags & PROTOPT_SSL) && !smtpc->ssldone) + if((conn->handler->flags & PROTOPT_SSL) && !smtpc->ssldone) { result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &smtpc->ssldone); - else - result = Curl_pp_statemach(&smtpc->pp, FALSE); + if(result || !smtpc->ssldone) + return result; + } + result = Curl_pp_statemach(&smtpc->pp, FALSE); *done = (smtpc->state == SMTP_STOP) ? TRUE : FALSE; return result; |