From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 14 Dec 2021 07:31:37 +0000 (+0100)
Subject: asyn-ares: ares_getaddrinfo needs no happy eyeballs timer
X-Git-Tag: curl-7_81_0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64e8bf9ff4670fbe5bde6f8eb4c9facc181fcae8;p=thirdparty%2Fcurl.git

asyn-ares: ares_getaddrinfo needs no happy eyeballs timer

Closes #8142
---

diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index fc168baa6e..fd0bb6c96a 100644
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -109,7 +109,9 @@ struct thread_data {
   struct Curl_addrinfo *temp_ai; /* intermediary result while fetching c-ares
                                     parts */
   int last_status;
+#ifndef HAVE_CARES_GETADDRINFO
   struct curltime happy_eyeballs_dns_time; /* when this timer started, or 0 */
+#endif
 };
 
 /* How long we are willing to wait for additional parallel responses after
@@ -375,6 +377,7 @@ CURLcode Curl_resolver_is_resolved(struct Curl_easy *data,
 
   waitperform(data, 0);
 
+#ifndef HAVE_CARES_GETADDRINFO
   /* Now that we've checked for any last minute results above, see if there are
      any responses still pending when the EXPIRE_HAPPY_EYEBALLS_DNS timer
      expires. */
@@ -397,6 +400,7 @@ CURLcode Curl_resolver_is_resolved(struct Curl_easy *data,
     ares_cancel((ares_channel)data->state.async.resolver);
     DEBUGASSERT(res->num_pending == 0);
   }
+#endif
 
   if(res && !res->num_pending) {
     (void)Curl_addrinfo_callback(data, res->last_status, res->temp_ai);