From: Andreas Streichardt <andreas@arangodb.com>
Date: Mon, 10 Oct 2016 11:08:24 +0000 (+0200)
Subject: resolve: add error message when resolving using SIGALRM
X-Git-Tag: curl-7_51_0~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb5199317ee729ab1893fc629a8f4f0ca7f7aa1e;p=thirdparty%2Fcurl.git

resolve: add error message when resolving using SIGALRM

Closes #1066
---

diff --git a/lib/hostip.c b/lib/hostip.c
index f2d984164d..24a922eb29 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -603,11 +603,14 @@ int Curl_resolv_timeout(struct connectdata *conn,
     /* USE_ALARM_TIMEOUT defined, but no timeout actually requested */
     return Curl_resolv(conn, hostname, port, entry);
 
-  if(timeout < 1000)
+  if(timeout < 1000) {
     /* The alarm() function only provides integer second resolution, so if
        we want to wait less than one second we must bail out already now. */
+    failf(data,
+        "remaining timeout of %ld too small to resolve via SIGALRM method",
+        timeout);
     return CURLRESOLV_TIMEDOUT;
-
+  }
   /* This allows us to time-out from the name resolver, as the timeout
      will generate a signal and we will siglongjmp() from that here.
      This technique has problems (see alarmfunc).