aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2010-03-02 21:20:22 +0000
committerDaniel Stenberg <daniel@haxx.se>2010-03-02 21:20:22 +0000
commit9b2cce236fa7dac594d1337b9b83bc88debf1871 (patch)
treed0f4bc03514ae15ebc96007edd1b406b1a34671f /lib
parentcd465e4ada29c947e1694b48abaf910e3c27f35e (diff)
- Based on patch provided by Jacob Moshenko, the transfer logic now properly
makes sure that when using sub-second timeouts, there's no final bad 1000ms wait. Previously, a sub-second timeout would often make the elapsed time end up the time rounded up to the nearest second (e.g. 1s for 200ms timeout)
Diffstat (limited to 'lib')
-rw-r--r--lib/transfer.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/transfer.c b/lib/transfer.c
index 2bfcb1762..ced43d44c 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -1067,11 +1067,11 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if(k->size != -1) {
failf(data, "Operation timed out after %ld milliseconds with %"
FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received",
- data->set.timeout, k->bytecount, k->size);
+ Curl_tvdiff(k->now, k->start), k->bytecount, k->size);
} else {
failf(data, "Operation timed out after %ld milliseconds with %"
FORMAT_OFF_T " bytes received",
- data->set.timeout, k->bytecount);
+ Curl_tvdiff(k->now, k->start), k->bytecount);
}
return CURLE_OPERATION_TIMEDOUT;
}
@@ -1266,8 +1266,17 @@ Transfer(struct connectdata *conn)
/* if this is the first lap and one of the file descriptors is fine
to work with, skip the timeout */
timeout_ms = 0;
- else
- timeout_ms = 1000;
+ else {
+ if(data->set.timeout) {
+ timeout_ms = data->set.timeout - Curl_tvdiff(k->now, k->start);
+ if(timeout_ms > 1000)
+ timeout_ms = 1000;
+ else if(timeout_ms < 0)
+ return CURLE_OPERATION_TIMEDOUT;
+ }
+ else
+ timeout_ms = 1000;
+ }
switch (Curl_socket_ready(fd_read, fd_write, timeout_ms)) {
case -1: /* select() error, stop reading */