better time selection for the connect timeout

diff --git a/lib/connect.c b/lib/connect.c
index 7efa9f006061f26549233a400eb162f8a170dd6f..749f8cb2aeab3af156d7da3d235b1c9721820ac2 100644 (file)
--- 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;