Commit e1d54108 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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.
parent 3b0f5220

lib/hostip.c

+4 −2
Original line number Diff line number Diff line
@@ -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