romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 16:03:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

multi_socket: improved 100-continue timeout handling

Browse source 
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.
This commit is contained in:
Daniel Stenberg 2013-08-27 22:32:51 +02:00
parent 3d1a453d88
commit a691e04470
4 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/multi.c
View file

@ -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;