Connect failures with the multi interface was often returned as "connect()

timed out" even though the reason was different. Fixed this problem by not
setting this timeout to zero when using multi.

diff --git a/CHANGES b/CHANGES
index 059f9aa53855b7632e41e2aa97dbc0287a5225b9..c33f4e709c22e0fad92660a2e87a078478b15fbd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel (29 January 2005)
+- Connect failures with the multi interface was often returned as "connect()
+  timed out" even though the reason was different.
+
 Daniel (28 January 2005)
 - KNOWN_BUGS #17 fixed. A DNS cache entry may not remain locked between two
   curl_easy_perform() invokes. It was previously unlocked at disconnect, which

diff --git a/lib/connect.c b/lib/connect.c
index 3b40891ada80e934017e1dae3037ce621835ad78..5cd4c06561080130ab8c72e9296aa6980c3b8a1c 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -754,7 +754,7 @@ CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
 
   if(data->state.used_interface == Curl_if_multi)
     /* don't hang when doing multi */
-    timeout_per_addr = timeout_ms = 0;
+    timeout_per_addr = 0;
 
   /*
    * Connecting with a Curl_addrinfo chain