Ates Goral found out that if you specified both CURLOPT_CONNECTTIMEOUT and

CURLOPT_TIMEOUT, the _longer_ time would wrongly be used for the SSL
connection time-out!

diff --git a/lib/ssluse.c b/lib/ssluse.c
index 60d174f..4a67b11 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -1332,7 +1332,7 @@ Curl_ossl_connect_step2(struct connectdata *conn,
 
     /* get the most strict timeout of the ones converted to milliseconds */
     if(data->set.timeout &&
-       (data->set.timeout>data->set.connecttimeout))
+       (data->set.timeout<data->set.connecttimeout))
       *timeout_ms = data->set.timeout*1000;
     else
       *timeout_ms = data->set.connecttimeout*1000;