diff options
| author | Tiit Pikma <tiit.pikma@cyber.ee> | 2014-02-13 11:49:27 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-02-13 16:05:17 +0100 |
| commit | c021a60bccff0feddfec9d756cd65497eab60b39 (patch) | |
| tree | 6fc993a8ae84809b12ddd97a3816d37d813ab549 /docs | |
| parent | bcb32e915eb700d058e12b2f3bd8b103a16244d8 (diff) | |
transfer: make Expect: 100-continue timeout configurable.
Replaced the #define CURL_TIMEOUT_EXPECT_100 in transfer.c with the
CURLOPT_EXPECT_100_TIMEOUT_MS option to make the timeout configurable.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 6 | ||||
| -rw-r--r-- | docs/libcurl/symbols-in-versions | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 9a1896471..459771519 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -1649,6 +1649,12 @@ Pass a long to tell libcurl how to act on transfer decoding. If set to zero, transfer decoding will be disabled, if set to 1 it is enabled (default). libcurl does chunked transfer decoding by default unless this option is set to zero. (added in 7.16.2) +.IP CURLOPT_EXPECT_100_TIMEOUT_MS +Pass a long to tell libcurl the number of milliseconds to wait for a server +response with the HTTP status 100 (Continue), 417 (Expectation Failed) or +similar after sending a HTTP request containing an Expect: 100-continue +header. If this times out before a response is received, the request body is +sent anyway. By default, libcurl waits 1000 milliseconds. (Added in 7.36.0) .SH SMTP OPTIONS .IP CURLOPT_MAIL_FROM Pass a pointer to a zero terminated string as parameter. This should be used diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index a3bc7a507..2e9fc4da0 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -341,6 +341,7 @@ CURLOPT_DNS_USE_GLOBAL_CACHE 7.9.3 7.11.1 CURLOPT_EGDSOCKET 7.7 CURLOPT_ENCODING 7.10 CURLOPT_ERRORBUFFER 7.1 +CURLOPT_EXPECT_100_TIMEOUT_MS 7.36.0 CURLOPT_FAILONERROR 7.1 CURLOPT_FILE 7.1 7.9.7 CURLOPT_FILETIME 7.5 |