From: Claes Jakobsson <claes@surfar.nu>
Date: Thu, 3 May 2012 11:49:55 +0000 (+0200)
Subject: Add note about default timeout in CURLOPT_TIMEOUT
X-Git-Tag: curl-7_26_0~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77bac2658736d1c323c38986c7741bc8ae68ca5b;p=thirdparty%2Fcurl.git

Add note about default timeout in CURLOPT_TIMEOUT
---

diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index a90ee65e6a..7d422e82a4 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