[HttpClient] Simplify control flow and make sure resolved records are stored to cache

d-metrius · d-metrius · commit 50de334aba45 · 2024-12-04T18:32:38.000+02:00
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -340,30 +340,26 @@ private static function dnsResolve(string $host, NativeClientState $multi, array
             $now = microtime(true);
 
             if ($ip = gethostbynamel($host)) {
-                $multi->dnsCache[$host] = $ip = $ip[0];
-                $info['debug'] .= "* Added {$host}:0:{$ip} to DNS cache\n";
-                $host = $ip;
-            } elseif (\defined('STREAM_PF_INET6')) {
-                if ($ip = dns_get_record($host, \DNS_AAAA)) {
-                    $multi->dnsCache[$host] = $ip = $ip[0]['ipv6'];
-                    $info['debug'] .= "* Added {$host}:0:{$ip} to DNS cache\n";
-                    $host = "[$ip]";
-                } elseif (\extension_loaded('sockets')) {
-                    if (!$addrInfo = socket_addrinfo_lookup($host, 0, ['ai_socktype' => \SOCK_STREAM, 'ai_family' => \AF_INET6])) {
-                        throw new TransportException(\sprintf('Could not resolve host "%s".', $host));
-                    }
-
-                    $ip = socket_addrinfo_explain($addrInfo[0])['ai_addr']['sin6_addr'];
-                    $host = "[$ip]";
-                } elseif ('localhost' === $host || 'localhost.' === $host) {
-                    $ip = '::1';
-                    $host = "[$ip]";
-                } else {
+                $ip = $ip[0];
+            } elseif (!\defined('STREAM_PF_INET6')) {
+                throw new TransportException(\sprintf('Could not resolve host "%s".', $host));
+            } elseif ($ip = dns_get_record($host, \DNS_AAAA)) {
+                $ip = $ip[0]['ipv6'];
+            } elseif (\extension_loaded('sockets')) {
+                if (!$addrInfo = socket_addrinfo_lookup($host, 0, ['ai_socktype' => \SOCK_STREAM, 'ai_family' => \AF_INET6])) {
                     throw new TransportException(\sprintf('Could not resolve host "%s".', $host));
                 }
+
+                $ip = socket_addrinfo_explain($addrInfo[0])['ai_addr']['sin6_addr'];
+            } elseif ('localhost' === $host || 'localhost.' === $host) {
+                $ip = '::1';
             } else {
                 throw new TransportException(\sprintf('Could not resolve host "%s".', $host));
             }
+
+            $multi->dnsCache[$host] = $ip;
+            $info['debug'] .= "* Added {$host}:0:{$ip} to DNS cache\n";
+            $host = str_contains($ip, ':') ? "[$ip]" : $ip;
         } else {
             $info['debug'] .= "* Hostname was found in DNS cache\n";
             $host = str_contains($ip, ':') ? "[$ip]" : $ip;
