From 0cf05af744a76f2411ea907d8ec4e929bd945245 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 5 Dec 2011 12:41:38 +0100 Subject: c-ares: return proxy failure for all proxy types When making a distinction which return code to return, the code previously only regarded HTTP proxies to be proxies and thus return host-related errors for failures on other proxy types than HTTP. Now all proxy types will be considered proxies... --- lib/asyn-ares.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/asyn-ares.c') diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index 1028583ca..f08a4d884 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -419,7 +419,7 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn, if(!conn->async.dns) { /* a name was not resolved */ if((timeout < 0) || (conn->async.status == ARES_ETIMEOUT)) { - if(conn->bits.httpproxy) { + if(conn->bits.proxy) { failf(data, "Resolving proxy timed out: %s", conn->proxy.dispname); rc = CURLE_COULDNT_RESOLVE_PROXY; } @@ -429,7 +429,7 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn, } } else if(conn->async.done) { - if(conn->bits.httpproxy) { + if(conn->bits.proxy) { failf(data, "Could not resolve proxy: %s (%s)", conn->proxy.dispname, ares_strerror(conn->async.status)); rc = CURLE_COULDNT_RESOLVE_PROXY; -- cgit v1.2.3