From 5c14a7f06864f20a62b1fd1961d30f1902e2280a Mon Sep 17 00:00:00 2001 From: Jiri Hruska Date: Tue, 10 Sep 2013 20:40:11 +0200 Subject: 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. --- lib/smtp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/smtp.c') 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; -- cgit v1.2.3