From 7dc32c0e490b24659d3a5d9c19df9f4b7ac1c916 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 1 Jun 2009 19:44:30 +0200 Subject: [PATCH 01/10] In Curl_proxyCONNECT(), let the first timeout check return CURLE_RECV_ERROR, like the second one does. error is never read here, so don't set it. --- lib/http.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git lib/http.c lib/http.c index cd2307d..a7e6d4d 100644 --- lib/http.c +++ lib/http.c @@ -1419,8 +1419,7 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, Curl_tvdiff(Curl_tvnow(), conn->now); /* spent time */ if(check <=0 ) { failf(data, "Proxy CONNECT aborted due to timeout"); - error = SELECT_TIMEOUT; /* already too little time */ - break; + return CURLE_RECV_ERROR; } /* if we're in multi-mode and we would block, return instead for a retry */ -- 1.6.3.1