[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 13/264: easy: Fix curl_easy_duphandle for builds missing IPv6 th
From: |
gnunet |
Subject: |
[gnurl] 13/264: easy: Fix curl_easy_duphandle for builds missing IPv6 that use c-ares |
Date: |
Thu, 30 Apr 2020 16:05:16 +0200 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit 3bfda07004a5739fb306e55cb9529ba3de35fbdb
Author: Jay Satiro <address@hidden>
AuthorDate: Sat Mar 14 02:19:04 2020 -0400
easy: Fix curl_easy_duphandle for builds missing IPv6 that use c-ares
- Ignore CURLE_NOT_BUILT_IN errors returned by c-ares functions in
curl_easy_duphandle.
Prior to this change if c-ares was used as the resolver backend and
either it was too old or libcurl was built without IPv6 support then
some of our resolver functions could return CURLE_NOT_BUILT_IN to
curl_easy_duphandle causing it to fail.
Caused by c8f086b which shipped in 7.69.1.
Reported-by: Karl Chen
Fixes https://github.com/curl/curl/issues/5097
Closes https://github.com/curl/curl/pull/5100
---
lib/easy.c | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/lib/easy.c b/lib/easy.c
index b648e80c1..d08c6066c 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -884,14 +884,25 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy
*data)
goto fail;
#ifdef USE_ARES
- if(Curl_set_dns_servers(outcurl, data->set.str[STRING_DNS_SERVERS]))
- goto fail;
- if(Curl_set_dns_interface(outcurl, data->set.str[STRING_DNS_INTERFACE]))
- goto fail;
- if(Curl_set_dns_local_ip4(outcurl, data->set.str[STRING_DNS_LOCAL_IP4]))
- goto fail;
- if(Curl_set_dns_local_ip6(outcurl, data->set.str[STRING_DNS_LOCAL_IP6]))
- goto fail;
+ {
+ CURLcode rc;
+
+ rc = Curl_set_dns_servers(outcurl, data->set.str[STRING_DNS_SERVERS]);
+ if(rc && rc != CURLE_NOT_BUILT_IN)
+ goto fail;
+
+ rc = Curl_set_dns_interface(outcurl, data->set.str[STRING_DNS_INTERFACE]);
+ if(rc && rc != CURLE_NOT_BUILT_IN)
+ goto fail;
+
+ rc = Curl_set_dns_local_ip4(outcurl, data->set.str[STRING_DNS_LOCAL_IP4]);
+ if(rc && rc != CURLE_NOT_BUILT_IN)
+ goto fail;
+
+ rc = Curl_set_dns_local_ip6(outcurl, data->set.str[STRING_DNS_LOCAL_IP6]);
+ if(rc && rc != CURLE_NOT_BUILT_IN)
+ goto fail;
+ }
#endif /* USE_ARES */
Curl_convert_setup(outcurl);
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 01/264: configure: document 'compiler_num' for gcc, (continued)
- [gnurl] 01/264: configure: document 'compiler_num' for gcc, gnunet, 2020/04/30
- [gnurl] 03/264: configure: convert -I to -isystem as a last step, gnunet, 2020/04/30
- [gnurl] 02/264: configure: fix -pedantic-errors for GCC 5 and later, gnunet, 2020/04/30
- [gnurl] 04/264: Makefile: run the cd commands in a subshell, gnunet, 2020/04/30
- [gnurl] 06/264: RELEASE-NOTES: synced, gnunet, 2020/04/30
- [gnurl] 09/264: smbserver: pin Python version to 2 since we are not yet 3 compatible, gnunet, 2020/04/30
- [gnurl] 10/264: impacket: some more Python 3 code compatibility updates, gnunet, 2020/04/30
- [gnurl] 08/264: cleanup: fix some text/comment typos, gnunet, 2020/04/30
- [gnurl] 05/264: tests/data: Fix some XML formatting issues in test cases, gnunet, 2020/04/30
- [gnurl] 11/264: server/getpart: make the "XML-parser" stricter, gnunet, 2020/04/30
- [gnurl] 13/264: easy: Fix curl_easy_duphandle for builds missing IPv6 that use c-ares,
gnunet <=
- [gnurl] 17/264: ci/tests: fix and align setting TFLAGS for make test-nonflaky, gnunet, 2020/04/30
- [gnurl] 14/264: Makefile.m32: Improve windres parameter compatibility, gnunet, 2020/04/30
- [gnurl] 19/264: select: move duplicate select preparation code into Curl_select, gnunet, 2020/04/30
- [gnurl] 24/264: tests/README: add note about manually installing python-impacket, gnunet, 2020/04/30
- [gnurl] 23/264: transfer: cap retries of "dead connections" to 5, gnunet, 2020/04/30
- [gnurl] 25/264: ci/tests: install impacket for SMB tests on FreeBSD using CirrusCI, gnunet, 2020/04/30
- [gnurl] 20/264: select: fix 'pending_ms' is assigned a value that is never used, gnunet, 2020/04/30
- [gnurl] 27/264: gskit: use our internal select wrapper for portability, gnunet, 2020/04/30
- [gnurl] 29/264: ci/tests: fix Azure Pipelines not running for pull requests, gnunet, 2020/04/30
- [gnurl] 28/264: gskit: update the copyright year range, gnunet, 2020/04/30