[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 31/205: ares: return error at once if timed out bef
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 31/205: ares: return error at once if timed out before name resolve starts |
Date: |
Thu, 20 Apr 2017 16:19:31 +0200 |
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
- [GNUnet-SVN] [gnurl] 117/205: openssl: exclude DSA code when OPENSSL_NO_DSA is defined, (continued)
- [GNUnet-SVN] [gnurl] 117/205: openssl: exclude DSA code when OPENSSL_NO_DSA is defined, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 144/205: fail-early.d: fix typos, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 130/205: select: use correct SIZEOF_ constant, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 116/205: examples/fopen: checksrc compliance, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 115/205: schannel: fix variable shadowing warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 51/205: vtls: add options to specify range of enabled TLS versions, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 132/205: schannel: fix unused variable warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 103/205: CURLINFO_PRIMARY_IP.3: add example, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 81/205: BINDINGS: a Delphi binding, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 119/205: pause: handle mixed types of data when paused, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 31/205: ares: return error at once if timed out before name resolve starts,
gnunet <=
- [GNUnet-SVN] [gnurl] 126/205: NTLM: check for features with #ifdef instead of #if, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 143/205: docs: Explain --fail-early does not imply --fail, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 142/205: telnet: (win32) fix read callback return variable, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 169/205: gtls: fix compiler warning, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 152/205: hash: move key into hash struct to reduce mallocs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 199/205: openssl: fix thread-safety bugs in error-handling, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 121/205: conncache: make hashkey avoid malloc, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 167/205: low_speed_limit: improved function for longer time periods, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 157/205: multi: fix queueing of pending easy handles, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 78/205: Improve code readbility, gnunet, 2017/04/20