aboutsummaryrefslogtreecommitdiff
path: root/lib/transfer.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/transfer.c')
-rw-r--r--lib/transfer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/transfer.c b/lib/transfer.c
index 28fbf702d..449b2e6eb 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -863,7 +863,7 @@ Transfer(struct connectdata *c_conn)
}
if (data->set.timeout &&
- ((Curl_tvdiff(now, start)/1000) > data->set.timeout)) {
+ ((Curl_tvdiff(now, start)/1000) >= data->set.timeout)) {
failf (data, "Operation timed out with %d out of %d bytes received",
bytecount, conn->size);
return CURLE_OPERATION_TIMEOUTED;
@@ -914,6 +914,7 @@ CURLcode Curl_perform(struct SessionHandle *data)
data->set.followlocation=0; /* reset the location-follow counter */
data->state.this_is_a_follow = FALSE; /* reset this */
+ data->state.errorbuf = FALSE; /* no error has occurred */
Curl_initinfo(data); /* reset session-specific information "variables" */