[HttpClient] Extract common parts and fix microtime(true) placement bug

d-metrius · d-metrius · commit fb75acc0a742 · 2024-12-04T19:00:09.000+02:00
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -332,12 +332,12 @@ private static function dnsResolve(string $host, NativeClientState $multi, array
     {
         $flag = '' !== $host && '[' === $host[0] && ']' === $host[-1] && str_contains($host, ':') ? \FILTER_FLAG_IPV6 : \FILTER_FLAG_IPV4;
         $ip = \FILTER_FLAG_IPV6 === $flag ? substr($host, 1, -1) : $host;
+        $now = microtime(true);
 
         if (filter_var($ip, \FILTER_VALIDATE_IP, $flag)) {
             // The host is already an IP address
         } elseif (null === $ip = $multi->dnsCache[$host] ?? null) {
             $info['debug'] .= "* Hostname was NOT found in DNS cache\n";
-            $now = microtime(true);
 
             if ($ip = gethostbynamel($host)) {
                 $ip = $ip[0];
@@ -359,12 +359,11 @@ private static function dnsResolve(string $host, NativeClientState $multi, array
 
             $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;
         }
 
+        $host = str_contains($ip, ':') ? "[$ip]" : $ip;
         $info['namelookup_time'] = microtime(true) - ($info['start_time'] ?: $now);
         $info['primary_ip'] = $ip;
 
