From d8706bf729d7fcbcd1e261ccbd2cb787176ccb8e Mon Sep 17 00:00:00 2001 From: Dirk Manske Date: Mon, 20 Sep 2010 13:58:51 +0200 Subject: [PATCH] multi_runsingle: set timeout error messages With the latest changes to fix the timeout handling with multi interface we lost the timeout error messages. This patch brings them back. --- lib/multi.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/lib/multi.c b/lib/multi.c index 13915c1..e857392 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -985,6 +985,19 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, if(timeout_ms < 0) { /* Handle timed out */ + if(easy->state == CURLM_STATE_WAITRESOLVE) + failf(data, "Resolving timed out after %ld milliseconds", + Curl_tvdiff(now, data->progress.t_startsingle)); + else if(easy->state == CURLM_STATE_WAITCONNECT) + failf(data, "Connection timed out after %ld milliseconds", + Curl_tvdiff(now, data->progress.t_startsingle)); + else { + k = &data->req; + failf(data, "Operation timed out after %ld milliseconds with %" + FORMAT_OFF_T " out of %" FORMAT_OFF_T " bytes received", + Curl_tvdiff(now, data->progress.t_startsingle), k->bytecount, + k->size); + } easy->result = CURLE_OPERATION_TIMEDOUT; multistate(easy, CURLM_STATE_COMPLETED); break; -- 1.7.0.2