From: Daniel Stenberg Date: Fri, 20 Sep 2013 21:16:04 +0000 (+0200) Subject: curl_easy_setopt.3: clarify that TIMEOUT and TIMEOUT_MS set the same value X-Git-Tag: curl-7_33_0~56 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af44da38d682b1fef97b8d4cf62e183eff6dc345;p=thirdparty%2Fcurl.git curl_easy_setopt.3: clarify that TIMEOUT and TIMEOUT_MS set the same value --- diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index a8d764f07e..b68d30569b 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -2162,10 +2162,14 @@ In unix-like systems, this might cause signals to be used unless 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 -of the transfer will still use full-second resolution for timeouts with -a minimum timeout allowed of one second. +An alternative to \fICURLOPT_TIMEOUT\fP but takes number of milliseconds +instead. If libcurl is built to use the standard system name resolver, that +portion of the transfer will still use full-second resolution for timeouts +with a minimum timeout allowed of one second. + +If both \fICURLOPT_TIMEOUT\fP and \fICURLOPT_TIMEOUT_MS\fP are set, the value +set last will be used. + (Added in 7.16.2) .IP CURLOPT_LOW_SPEED_LIMIT Pass a long as parameter. It contains the transfer speed in bytes per second