diff options
author | Alessandro Ghedini <alessandro@ghedini.me> | 2013-12-17 11:14:42 +0100 |
---|---|---|
committer | Alessandro Ghedini <alessandro@ghedini.me> | 2013-12-17 11:14:42 +0100 |
commit | b40308b18042c9bb55c6e0388e3715bc264b1b55 (patch) | |
tree | 53cb75bb6d04f7cb6a410bf1bbf0e0391d9fae54 /lib/transfer.c | |
parent | 3b8c5de1a123041aa79bbb3aded3b643bd42782d (diff) |
Imported Upstream version 7.34.0
Diffstat (limited to 'lib/transfer.c')
-rw-r--r-- | lib/transfer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index 533e394b..e3194415 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -1309,10 +1309,11 @@ CURLcode Curl_pretransfer(struct SessionHandle *data) Curl_pgrsStartNow(data); if(data->set.timeout) - Curl_expire(data, data->set.timeout); + Curl_expire(data, data->set.timeout + MULTI_TIMEOUT_INACCURACY_MS); if(data->set.connecttimeout) - Curl_expire(data, data->set.connecttimeout); + Curl_expire(data, data->set.connecttimeout + + MULTI_TIMEOUT_INACCURACY_MS); /* 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 |