aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaes Jakobsson <claes@surfar.nu>2012-05-03 13:49:55 +0200
committerClaes Jakobsson <claes@surfar.nu>2012-05-03 13:49:55 +0200
commit77bac2658736d1c323c38986c7741bc8ae68ca5b (patch)
treee0a522a853991149d529a0a153db47fa56d63b8f
parentd6773834f2c8e4453cfa0b38a6dd780f53575e95 (diff)
Add note about default timeout in CURLOPT_TIMEOUT
-rw-r--r--docs/libcurl/curl_easy_setopt.32
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index a90ee65e6..7d422e82a 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -1965,6 +1965,8 @@ SIGALRM to enable time-outing system calls.
In unix-like systems, this might cause signals to be used unless
\fICURLOPT_NOSIGNAL\fP is set.
+
+Default timeout is 0 (zero) which means it never times out.
.IP CURLOPT_TIMEOUT_MS
Like \fICURLOPT_TIMEOUT\fP but takes number of milliseconds instead. If
libcurl is built to use the standard system name resolver, that portion