From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 6 Feb 2025 22:01:55 +0000 (+0100)
Subject: asyn-thread: fix the returned bitmask from Curl_resolver_getsock
X-Git-Tag: curl-8_12_1~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ff01152c76e82d3626e3afb592312050d4a6516;p=thirdparty%2Fcurl.git

asyn-thread: fix the returned bitmask from Curl_resolver_getsock

It should use a bitwise OR, not an assignment so that it does not
override the c-ares bits.

Closes #16227
---

diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
index 8d6a9deb4a..8383edad72 100644
--- a/lib/asyn-thread.c
+++ b/lib/asyn-thread.c
@@ -688,7 +688,7 @@ int Curl_resolver_getsock(struct Curl_easy *data, curl_socket_t *socks)
   if(td) {
     /* return read fd to client for polling the DNS resolution status */
     socks[socketi] = td->tsd.sock_pair[0];
-    ret_val = GETSOCK_READSOCK(socketi);
+    ret_val |= GETSOCK_READSOCK(socketi);
   }
   else {
 #endif