[GNUnet-SVN] [gnurl] 31/205: ares: return error at once if timed out before name resolve starts

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.

commit 29be83ee74880030a16af46396ee83a3d8ba724b
Author: Daniel Stenberg <address@hidden>
AuthorDate: Mon Mar 6 09:21:01 2017 +0100

    ares: return error at once if timed out before name resolve starts
    
    Pointed-out-by: Ray Satiro
    Bug: https://curl.haxx.se/mail/lib-2017-03/0004.html
---
 lib/asyn-ares.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index c038c2a3f..ae73d0502 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -359,6 +359,11 @@ CURLcode Curl_resolver_wait_resolv(struct connectdata 
*conn,
   struct Curl_dns_entry *temp_entry;
 
   timeout = Curl_timeleft(data, &now, TRUE);
+  if(timeout < 0) {
+    /* already expired! */
+    connclose(conn, "Timed out before name resolve started");
+    return CURLE_OPERATION_TIMEDOUT;
+  }
   if(!timeout)
     timeout = CURL_TIMEOUT_RESOLVE * 1000; /* default name resolve timeout */
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden