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 /lib/imap.c | |
| 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.
Diffstat (limited to 'lib/imap.c')
| -rw-r--r-- | lib/imap.c | 8 |
1 files changed, 5 insertions, 3 deletions
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; |