make the SSL connect use the same default connect timeout define as the

generic connect uses

diff --git a/lib/connect.c b/lib/connect.c
index a30614334d1c9cda5bb50dee16e88d0b704012e3..46d7d8e145356aae5e60a36417d536577cd5f23d 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -101,8 +101,6 @@
 /* The last #include file should be: */
 #include "memdebug.h"
 
-#define DEFAULT_CONNECT_TIMEOUT 300000 /* milliseconds == five minutes */
-
 static bool verifyconnect(curl_socket_t sockfd, int *error);
 
 static curl_socket_t

diff --git a/lib/connect.h b/lib/connect.h
index 6cf6b9a42faa833d28a9fcb9a02b29480821899c..d39495cfc75c48fc3ce2c35096da7e9f14019915 100644 (file)
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -38,4 +38,7 @@ CURLcode Curl_connecthost(struct connectdata *conn,
                           );
 
 int Curl_ourerrno(void);
+
+#define DEFAULT_CONNECT_TIMEOUT 300000 /* milliseconds == five minutes */
+
 #endif

diff --git a/lib/ssluse.c b/lib/ssluse.c
index aa7da18e3289f2d74a403333c534bab723841e8d..adebde29425b87e0df53001408d0a95d105b7022 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -1269,7 +1269,7 @@ Curl_SSLConnect(struct connectdata *conn,
     }
     else
       /* no particular time-out has been set */
-      timeout_ms=300000; /* milliseconds, default to five minutes */
+      timeout_ms= DEFAULT_CONNECT_TIMEOUT;
 
 
     FD_ZERO(&writefd);