diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-09-20 23:16:04 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-09-20 23:16:04 +0200 |
| commit | af44da38d682b1fef97b8d4cf62e183eff6dc345 (patch) | |
| tree | 877b85701e2e31f87a7b84ca1f59ef7c66c810ae /docs | |
| parent | fcfa26a7ee8ea45ff46663759c5ba90c109f0efa (diff) | |
curl_easy_setopt.3: clarify that TIMEOUT and TIMEOUT_MS set the same value
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index a8d764f07..b68d30569 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 |