diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-08-27 22:32:51 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-08-28 00:07:12 +0200 |
| commit | a691e044705f12715fcd3310a9832dd5de79bff0 (patch) | |
| tree | b28f8575c2cdc608f84399454246c78a49eb1247 /lib/multiif.h | |
| parent | 3d1a453d887a6272f48c241af6190d17891aef02 (diff) | |
| download | curl-a691e044705f12715fcd3310a9832dd5de79bff0.tar.gz | |
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.
Diffstat (limited to 'lib/multiif.h')
| -rw-r--r-- | lib/multiif.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/multiif.h b/lib/multiif.h index d1b0e2fb3..e61c5c6f2 100644 --- a/lib/multiif.h +++ b/lib/multiif.h @@ -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 |