aboutsummaryrefslogtreecommitdiff
path: root/docs/libcurl/opts
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2014-12-15 14:42:21 -0500
committerDaniel Stenberg <daniel@haxx.se>2014-12-15 22:24:22 +0100
commit7b3afc952f28a823f8168fd4400ff0fedd8a6fa3 (patch)
treee24e33070ef51b21a3b1feef099a92edaf04a36e /docs/libcurl/opts
parent93227ddca5323880a8f4eeb8fca218f2970b3b8d (diff)
opts: Warn CURLOPT_TIMEOUT overrides when set after CURLOPT_TIMEOUT_MS
Change CURLOPT_TIMEOUT doc to warn that if CURLOPT_TIMEOUT and CURLOPT_TIMEOUT_MS are both set whichever one is set last is the one that will be used. Prior to this change that behavior was only noted in the CURLOPT_TIMEOUT_MS doc.
Diffstat (limited to 'docs/libcurl/opts')
-rw-r--r--docs/libcurl/opts/CURLOPT_TIMEOUT.33
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/libcurl/opts/CURLOPT_TIMEOUT.3 b/docs/libcurl/opts/CURLOPT_TIMEOUT.3
index 66ab8b92b..41e05690c 100644
--- a/docs/libcurl/opts/CURLOPT_TIMEOUT.3
+++ b/docs/libcurl/opts/CURLOPT_TIMEOUT.3
@@ -37,6 +37,9 @@ libcurl to use the SIGALRM signal to timeout system calls.
In unix-like systems, this might cause signals to be used unless
\fICURLOPT_NOSIGNAL(3)\fP is set.
+If both \fICURLOPT_TIMEOUT(3)\fP and \fICURLOPT_TIMEOUT_MS(3)\fP are set, the
+value set last will be used.
+
Since this puts a hard limit for how long time a request is allowed to take,
it has limited use in dynamic use cases with varying transfer times. You are
then advised to explore \fICURLOPT_LOW_SPEED_LIMIT(3)\fP,