moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-17 15:05:02 -05:00
Code Issues Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/easy.c
View File

@ -489,7 +489,6 @@ static int events_timer(CURLM *multi, /* multi handle */
ev->ms = timeout_ms; ev->ms = timeout_ms;
ev->msbump = TRUE; ev->msbump = TRUE;
/* fprintf(stderr, "%s: timeout %ld\n", __func__, timeout_ms); */
return 0; return 0;
} }
@ -647,8 +646,6 @@ static CURLcode wait_or_timeout(struct Curl_multi *multi, struct events *ev)
/* get the time stamp to use to figure out how long poll takes */ /* get the time stamp to use to figure out how long poll takes */
before = curlx_tvnow(); before = curlx_tvnow();
/* fprintf(stderr, "poll(), %d numfds\n", numfds); */
/* wait for activity or timeout */ /* wait for activity or timeout */
pollrc = Curl_poll(fds, numfds, (int)ev->ms); pollrc = Curl_poll(fds, numfds, (int)ev->ms);
@ -793,15 +790,14 @@ static CURLcode easy_transfer(CURLM *multi)
* DEBUG: if 'events' is set TRUE, this function will use a replacement engine * DEBUG: if 'events' is set TRUE, this function will use a replacement engine
* instead of curl_multi_perform() and use curl_multi_socket_action(). * instead of curl_multi_perform() and use curl_multi_socket_action().
*/ */
static CURLcode easy_perform(CURL *easy, bool events) static CURLcode easy_perform(struct SessionHandle *data, bool events)
{ {
CURLM *multi; CURLM *multi;
CURLMcode mcode; CURLMcode mcode;
CURLcode code = CURLE_OK; CURLcode code = CURLE_OK;
struct SessionHandle *data = easy;
SIGPIPE_VARIABLE(pipe_st); SIGPIPE_VARIABLE(pipe_st);
if(!easy) if(!data)
return CURLE_BAD_FUNCTION_ARGUMENT; return CURLE_BAD_FUNCTION_ARGUMENT;
if(data->multi) { if(data->multi) {
@ -823,7 +819,7 @@ static CURLcode easy_perform(CURL *easy, bool events)
/* Copy the MAXCONNECTS option to the multi handle */ /* Copy the MAXCONNECTS option to the multi handle */
curl_multi_setopt(multi, CURLMOPT_MAXCONNECTS, data->set.maxconnects); curl_multi_setopt(multi, CURLMOPT_MAXCONNECTS, data->set.maxconnects);
mcode = curl_multi_add_handle(multi, easy); mcode = curl_multi_add_handle(multi, data);
if(mcode) { if(mcode) {
curl_multi_cleanup(multi); curl_multi_cleanup(multi);
if(mcode == CURLM_OUT_OF_MEMORY) if(mcode == CURLM_OUT_OF_MEMORY)
@ -843,7 +839,7 @@ static CURLcode easy_perform(CURL *easy, bool events)
/* ignoring the return code isn't nice, but atm we can't really handle /* ignoring the return code isn't nice, but atm we can't really handle
a failure here, room for future improvement! */ a failure here, room for future improvement! */
(void)curl_multi_remove_handle(multi, easy); (void)curl_multi_remove_handle(multi, data);
sigpipe_restore(&pipe_st); sigpipe_restore(&pipe_st);

8
lib/multi.c
View File

@ -2104,12 +2104,6 @@ static CURLMcode add_next_timeout(struct timeval now,
return CURLM_OK; return CURLM_OK;
} }
#ifdef WIN32
#define TIMEOUT_INACCURACY 40000
#else
#define TIMEOUT_INACCURACY 3000
#endif
static CURLMcode multi_socket(struct Curl_multi *multi, static CURLMcode multi_socket(struct Curl_multi *multi,
bool checkall, bool checkall,
curl_socket_t s, curl_socket_t s,
@ -2215,7 +2209,7 @@ static CURLMcode multi_socket(struct Curl_multi *multi,
margin. margin.
*/ */
now.tv_usec += TIMEOUT_INACCURACY; now.tv_usec += MULTI_TIMEOUT_INACCURACY;
if(now.tv_usec >= 1000000) { if(now.tv_usec >= 1000000) {
now.tv_sec++; now.tv_sec++;
now.tv_usec -= 1000000; now.tv_usec -= 1000000;

8
lib/multiif.h
View File

@ -22,7 +22,13 @@
* *
***************************************************************************/ ***************************************************************************/
/* See multi_socket() for the explanation of this constant. Counted in number
of microseconds. */
#ifdef WIN32
#define MULTI_TIMEOUT_INACCURACY 40000
#else
#define MULTI_TIMEOUT_INACCURACY 3000
#endif
/* /*
* Prototypes for library-wide functions provided by multi.c * Prototypes for library-wide functions provided by multi.c

6
lib/transfer.c
View File

@ -1952,8 +1952,10 @@ Curl_setup_transfer(
k->exp100 = EXP100_AWAITING_CONTINUE; k->exp100 = EXP100_AWAITING_CONTINUE;
k->start100 = Curl_tvnow(); k->start100 = Curl_tvnow();
/* set a timeout for the multi interface */ /* Set a timeout for the multi interface. Add the inaccuracy margin so
Curl_expire(data, CURL_TIMEOUT_EXPECT_100); that we don't fire slightly too early and get denied to run. */
Curl_expire(data, CURL_TIMEOUT_EXPECT_100 +
MULTI_TIMEOUT_INACCURACY / 1000);
} }
else { else {
if(data->state.expect100header) if(data->state.expect100header)