connection timeout is now supported

3 files changed, 21 insertions, 5 deletions

diff --git a/docs/TODO b/docs/TODO
index 035795f7c..9b8e85240 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -9,10 +9,6 @@ TODO
  Things to do in project cURL. Please tell me what you think, contribute and
  send me patches that improve things!
 
-To do for the 7.7 release:
-
- * Add a special connection-timeout that only goes for the connection phase.
-
 To do for the 7.8 release:
 
  * Make SSL session ids get used if multiple HTTPS documents from the same
diff --git a/docs/curl.1 b/docs/curl.1
index 0587309d5..b28b0495c 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -2,7 +2,7 @@
 .\" nroff -man curl.1
 .\" Written by Daniel Stenberg
 .\"
-.TH curl 1 "14 March 2001" "Curl 7.7" "Curl Manual"
+.TH curl 1 "15 March 2001" "Curl 7.7" "Curl Manual"
 .SH NAME
 curl \- get a URL with FTP, TELNET, LDAP, GOPHER, DICT, FILE, HTTP or
 HTTPS syntax.
@@ -91,6 +91,14 @@ also be enforced by using an URL that ends with ";type=A". This option causes
 data sent to stdout to be in text mode for win32 systems.
 
 If this option is used twice, the second one will disable ASCII usage.
+.IP "--connect-timeout <seconds>"
+Maximum time in seconds that you allow the connection to the server to take.
+This only limits the connection phase, once curl has connected this option is
+of no more use. This option doesn't work in win32 systems.  See also the
+.I "--max-time"
+option.
+
+If this option is used serveral times, the last one will be used.
 .IP "-c/--continue"
 .B Deprecated. Use '-C -' instead.
 Continue/Resume a previous file transfer. This instructs curl to
@@ -295,6 +303,9 @@ If this option is used twice, the second will again disable location following.
 Maximum time in seconds that you allow the whole operation to take.  This is
 useful for preventing your batch jobs from hanging for hours due to slow
 networks or links going down.  This doesn't work fully in win32 systems.
+See also the
+.I "--connect-timeout"
+option.
 
 If this option is used serveral times, the last one will be used.
 .IP "-M/--manual"
diff --git a/docs/curl_easy_setopt.3 b/docs/curl_easy_setopt.3
index f900807fb..34c647447 100644
--- a/docs/curl_easy_setopt.3
+++ b/docs/curl_easy_setopt.3
@@ -470,6 +470,15 @@ the more secure will the SSL connection become.
 .B CURLOPT_FORBID_REUSE
 Pass a char * to the zero terminated path name to the Entropy Gathering Daemon
 socket. It will be used to seed the random engine for SSL.
+.TP
+.B CURLOPT_CONNECTTIMEOUT
+Pass a long. It should contain the maximum time in seconds that you allow the
+connection to the server to take.  This only limits the connection phase, once
+it has connected, this option is of no more use. Set to zero to disable
+connection timeout (it will then only timeout on the system's internal
+timeouts). This option doesn't work in win32 systems.  See also the
+.I CURLOPT_TIMEOUT
+option.
 .PP
 .SH RETURN VALUE
 0 means the option was set properly, non-zero means an error as