From a691e044705f12715fcd3310a9832dd5de79bff0 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 27 Aug 2013 22:32:51 +0200 Subject: multi_socket: improved 100-continue timeout handling When waiting for a 100-continue response from the server, the Curl_readwrite() will refuse to run if called until the timeout has been reached. We timeout code in multi_socket() allows code to run slightly before the actual timeout time, so for test 154 it could lead to the function being executed but refused in Curl_readwrite() and then the application would just sit idling forever. This was detected with runtests.pl -e on test 154. --- lib/multi.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'lib/multi.c') diff --git a/lib/multi.c b/lib/multi.c index 6b4236198..fb495e078 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -2104,12 +2104,6 @@ static CURLMcode add_next_timeout(struct timeval now, return CURLM_OK; } -#ifdef WIN32 -#define TIMEOUT_INACCURACY 40000 -#else -#define TIMEOUT_INACCURACY 3000 -#endif - static CURLMcode multi_socket(struct Curl_multi *multi, bool checkall, curl_socket_t s, @@ -2215,7 +2209,7 @@ static CURLMcode multi_socket(struct Curl_multi *multi, margin. */ - now.tv_usec += TIMEOUT_INACCURACY; + now.tv_usec += MULTI_TIMEOUT_INACCURACY; if(now.tv_usec >= 1000000) { now.tv_sec++; now.tv_usec -= 1000000; -- cgit v1.2.3