From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 10 Apr 2006 21:49:55 +0000 (+0000)
Subject: Ates Goral found out that if you specified both CURLOPT_CONNECTTIMEOUT and
X-Git-Tag: curl-7_15_4~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=676597e9618970e7e2dfdfe440b09c3aee625576;p=thirdparty%2Fcurl.git

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 60d174fd1d..4a67b11241 100644
--- 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;