From c021a60bccff0feddfec9d756cd65497eab60b39 Mon Sep 17 00:00:00 2001 From: Tiit Pikma Date: Thu, 13 Feb 2014 11:49:27 +0200 Subject: 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. --- lib/url.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lib/url.c') diff --git a/lib/url.c b/lib/url.c index 3f2112d8a..5020a2bdf 100644 --- a/lib/url.c +++ b/lib/url.c @@ -565,6 +565,8 @@ CURLcode Curl_init_userdefined(struct UserDefined *set) set->ssl_enable_npn = TRUE; set->ssl_enable_alpn = TRUE; + + set->expect_100_timeout = 1000L; /* Wait for a second by default. */ return res; } @@ -1256,6 +1258,14 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, } break; + case CURLOPT_EXPECT_100_TIMEOUT_MS: + /* + * Time to wait for a response to a HTTP request containing an + * Expect: 100-continue header before sending the data anyway. + */ + data->set.expect_100_timeout = va_arg(param, long); + break; + #endif /* CURL_DISABLE_HTTP */ case CURLOPT_CUSTOMREQUEST: -- cgit v1.2.3