diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-01-05 16:38:18 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-01-12 00:11:53 +0100 |
| commit | 3b183df9cc781b329ca409ded1ea336530624715 (patch) | |
| tree | cd335d59f73dd0ec90682ab39b0438a8959bec1e /lib/connect.c | |
| parent | 7cd45b297ec2d09af92cd6defccd54c7e9ac5a3d (diff) | |
multi: remove MULTI_TIMEOUT_INACCURACY
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.
Diffstat (limited to 'lib/connect.c')
| -rw-r--r-- | lib/connect.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/connect.c b/lib/connect.c index f04cce7e3..0816af2d4 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -1104,8 +1104,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */ conn->tempaddr[1] = NULL; conn->tempsock[0] = CURL_SOCKET_BAD; conn->tempsock[1] = CURL_SOCKET_BAD; - Curl_expire(conn->data, - HAPPY_EYEBALLS_TIMEOUT + (MULTI_TIMEOUT_INACCURACY/1000)); + Curl_expire(conn->data, HAPPY_EYEBALLS_TIMEOUT); /* Max time for the next connection attempt */ conn->timeoutms_per_addr = |