From 4163b86cd2562dbffaea1541b0ec9e7c982a0dda Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 2 Nov 2001 22:30:34 +0000 Subject: failf() now only overwrites the error buffer the first time it gets called for each *_perform(). It makes things a lot easier, as the first one that detects the error get to write the final error reason... --- lib/transfer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/transfer.c') 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" */ -- cgit v1.2.3