From bfa9c42c2561fd8ff6504cfd94a2df379df9b77f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 21 Oct 2005 19:21:19 +0000 Subject: Bradford Bruce made the windows resolver code properly return CURLE_COULDNT_RESOLVE_PROXY and CURLE_COULDNT_RESOLVE_HOST on resolving errors (as documented). --- lib/hostthre.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/hostthre.c b/lib/hostthre.c index c364ebfab..eb8e02e12 100644 --- a/lib/hostthre.c +++ b/lib/hostthre.c @@ -660,15 +660,22 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn, rc = CURLE_OUT_OF_MEMORY; failf(data, "Could not resolve host: %s", curl_easy_strerror(rc)); } + else if(conn->async.done) { + if(conn->bits.httpproxy) { + failf(data, "Could not resolve proxy: %s; %s", + conn->proxy.dispname, Curl_strerror(conn, conn->async.status)); + rc = CURLE_COULDNT_RESOLVE_PROXY; + } + else { + failf(data, "Could not resolve host: %s; %s", + conn->host.name, Curl_strerror(conn, conn->async.status)); + rc = CURLE_COULDNT_RESOLVE_HOST; + } + } else if (td->thread_status == (DWORD)-1 || conn->async.status == NO_DATA) { failf(data, "Resolving host timed out: %s", conn->host.name); rc = CURLE_OPERATION_TIMEDOUT; } - else if(conn->async.done) { - failf(data, "Could not resolve host: %s; %s", - conn->host.name, Curl_strerror(conn,conn->async.status)); - rc = CURLE_COULDNT_RESOLVE_HOST; - } else rc = CURLE_OPERATION_TIMEDOUT; } -- cgit v1.2.3