generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multi: remove MULTI_TIMEOUT_INACCURACY

Browse Source 
With the recently added timeout "reminder" functionality, there's no
reason left for us to execute timeout code before the time is
ripe. Simplifies the handling too.

This will make the *TIMEOUT and *CONNECTTIMEOUT options more accurate
again, which probably is most important when the *_MS versions are used.

In multi_socket, make sure to update 'now' after having handled activity
on a socket.
This commit is contained in:
Daniel Stenberg
2014-01-05 16:38:18 +01:00
parent 7cd45b297e
commit 3b183df9cc
4 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/transfer.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1320,11 +1320,10 @@ CURLcode Curl_pretransfer(struct SessionHandle *data)
Curl_pgrsStartNow(data);
if(data->set.timeout)
Curl_expire(data, data->set.timeout + MULTI_TIMEOUT_INACCURACY_MS);
Curl_expire(data, data->set.timeout);
if(data->set.connecttimeout)
Curl_expire(data, data->set.connecttimeout +
MULTI_TIMEOUT_INACCURACY_MS);
Curl_expire(data, data->set.connecttimeout);
/* In case the handle is re-used and an authentication method was picked
in the session we need to make sure we only use the one(s) we now
@@ -1970,8 +1969,7 @@ Curl_setup_transfer(
/* Set a timeout for the multi interface. Add the inaccuracy margin so
that we don't fire slightly too early and get denied to run. */
Curl_expire(data, CURL_TIMEOUT_EXPECT_100 +
MULTI_TIMEOUT_INACCURACY / 1000);
Curl_expire(data, CURL_TIMEOUT_EXPECT_100);
}
else {
if(data->state.expect100header)