From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 2 Feb 2004 15:53:50 +0000 (+0000)
Subject: Dirk Manske fixed the ares usage even more. We could get a timeout from ares
X-Git-Tag: curl-7_11_1~450
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d541086c457eb22ac130fcbaad26014e069d23;p=thirdparty%2Fcurl.git

Dirk Manske fixed the ares usage even more. We could get a timeout from ares
as well, and when failing and not getting a timeout we now include the
error message ares can provide us with.
---

diff --git a/lib/hostip.c b/lib/hostip.c
index 2a709560ce..015825c928 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -534,12 +534,14 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn,
 
   if(!conn->async.dns) {
     /* a name was not resolved */
-    if(timedout) {
+    if(timedout || (conn->async.status == ARES_ETIMEOUT)) {
       failf(data, "Resolving host timed out: %s", conn->name);
       rc = CURLE_OPERATION_TIMEDOUT;
     }
     else if(conn->async.done) {
-      failf(data, "Could not resolve host: %s", conn->name);
+      char **dummy=NULL; /* stupid never-used ares-thing */
+      failf(data, "Could not resolve host: %s (%s)", conn->name,
+            ares_strerror(conn->async.status, dummy));
       rc = CURLE_COULDNT_RESOLVE_HOST;
     }
     else