diff options
| author | Michael Kaufmann <mail@michael-kaufmann.ch> | 2017-09-24 21:33:46 +0200 |
|---|---|---|
| committer | Michael Kaufmann <mail@michael-kaufmann.ch> | 2017-09-28 21:32:20 +0200 |
| commit | c66d94d6da50b20a8bc218683bc88b54ac15d6c2 (patch) | |
| tree | 64c612a5040491379b8f26276f25238a7ade32ec | |
| parent | 46d63bbbe87685b2e9c7380585c03afaa1fcf157 (diff) | |
| download | curl-c66d94d6da50b20a8bc218683bc88b54ac15d6c2.tar.gz | |
docs: link CURLOPT_CONNECTTIMEOUT and CURLOPT_CONNECTTIMEOUT_MS
Closes #1922
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.3 | 4 | ||||
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3 | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.3 b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.3 index f18694862..a4bf32e06 100644 --- a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.3 +++ b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT.3 @@ -36,6 +36,9 @@ default built-in connection timeout - 300 seconds. See also the In unix-like systems, this might cause signals to be used unless \fICURLOPT_NOSIGNAL(3)\fP is set. + +If both \fICURLOPT_CONNECTTIMEOUT(3)\fP and \fICURLOPT_CONNECTTIMEOUT_MS(3)\fP +are set, the value set last will be used. .SH DEFAULT 300 .SH PROTOCOLS @@ -57,4 +60,5 @@ Always .SH RETURN VALUE Returns CURLE_OK .SH "SEE ALSO" +.BR CURLOPT_CONNECTTIMEOUT_MS "(3), " .BR CURLOPT_TIMEOUT "(3), " CURLOPT_LOW_SPEED_LIMIT "(3), " diff --git a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3 b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3 index 7a24a8b97..2a7f107a8 100644 --- a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3 +++ b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3 @@ -36,6 +36,9 @@ default built-in connection timeout - 300 seconds. See also the In unix-like systems, this might cause signals to be used unless \fICURLOPT_NOSIGNAL(3)\fP is set. + +If both \fICURLOPT_CONNECTTIMEOUT(3)\fP and \fICURLOPT_CONNECTTIMEOUT_MS(3)\fP +are set, the value set last will be used. .SH DEFAULT 300000 .SH PROTOCOLS @@ -57,4 +60,5 @@ Always .SH RETURN VALUE Returns CURLE_OK .SH "SEE ALSO" +.BR CURLOPT_CONNECTTIMEOUT "(3), " .BR CURLOPT_TIMEOUT "(3), " CURLOPT_LOW_SPEED_LIMIT "(3), " |