moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

c-ares: return proxy failure for all proxy types

Browse Source 
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...
This commit is contained in:
Daniel Stenberg 2011-12-05 12:41:38 +01:00
parent d5b5f64bce
commit 0cf05af744
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/asyn-ares.c
View File

@ -419,7 +419,7 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn,
if(!conn->async.dns) { if(!conn->async.dns) {
/* a name was not resolved */ /* a name was not resolved */
if((timeout < 0) || (conn->async.status == ARES_ETIMEOUT)) { 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); failf(data, "Resolving proxy timed out: %s", conn->proxy.dispname);
rc = CURLE_COULDNT_RESOLVE_PROXY; rc = CURLE_COULDNT_RESOLVE_PROXY;
} }
@ -429,7 +429,7 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata *conn,
} }
} }
else if(conn->async.done) { else if(conn->async.done) {
if(conn->bits.httpproxy) { if(conn->bits.proxy) {
failf(data, "Could not resolve proxy: %s (%s)", conn->proxy.dispname, failf(data, "Could not resolve proxy: %s (%s)", conn->proxy.dispname,
ares_strerror(conn->async.status)); ares_strerror(conn->async.status));
rc = CURLE_COULDNT_RESOLVE_PROXY; rc = CURLE_COULDNT_RESOLVE_PROXY;