From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 22 Feb 2002 15:44:37 +0000 (+0000)
Subject: better time selection for the connect timeout
X-Git-Tag: curl-7_9_5-pre4~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1ffe7b74a4235efa70908d9052922171fd51e14;p=thirdparty%2Fcurl.git

better time selection for the connect timeout
---

diff --git a/lib/connect.c b/lib/connect.c
index 7efa9f0060..749f8cb2ae 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -364,8 +364,13 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
 #endif
 
     /* get the most strict timeout of the ones converted to milliseconds */
-    if(data->set.timeout &&
-       (data->set.timeout < data->set.connecttimeout))
+    if(data->set.timeout && data->set.connecttimeout) {
+      if (data->set.timeout < data->set.connecttimeout)
+        timeout_ms = data->set.timeout*1000;
+      else 
+        timeout_ms = data->set.connecttimeout*1000;
+    }
+    else if(data->set.timeout)
       timeout_ms = data->set.timeout*1000;
     else
       timeout_ms = data->set.connecttimeout*1000;