[HttpClient] Fix option "bindto" with IPv6 addresses

Author: nicolas-grekas

CurlHttpClient.php

@@ -274,7 +274,7 @@ public function request(string $method, string $url, array $options = []): Respo
             if (file_exists($options['bindto'])) {
                 $curlopts[\CURLOPT_UNIX_SOCKET_PATH] = $options['bindto'];
             } elseif (!str_starts_with($options['bindto'], 'if!') && preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {
-                $curlopts[\CURLOPT_INTERFACE] = $matches[1];
+                $curlopts[\CURLOPT_INTERFACE] = trim($matches[1], '[]');
                 $curlopts[\CURLOPT_LOCALPORT] = $matches[2];
             } else {
                 $curlopts[\CURLOPT_INTERFACE] = $options['bindto'];

NativeHttpClient.php

@@ -334,7 +334,9 @@ private static function dnsResolve($host, NativeClientState $multi, array &$info
             $info['debug'] .= "* Hostname was NOT found in DNS cache\n";
             $now = microtime(true);
 
-            if (!$ip = gethostbynamel($host)) {
+            if ('[' === $host[0] && ']' === $host[-1] && filter_var(substr($host, 1, -1), \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)) {
+                $ip = [$host];
+            } elseif (!$ip = gethostbynamel($host)) {
                 throw new TransportException(sprintf('Could not resolve host "%s".', $host));
             }
 

Tests/CurlHttpClientTest.php

@@ -37,21 +37,6 @@ protected function getHttpClient(string $testCase): HttpClientInterface
         return new CurlHttpClient(['verify_peer' => false, 'verify_host' => false], 6, 50);
     }
 
-    public function testBindToPort()
-    {
-        $client = $this->getHttpClient(__FUNCTION__);
-        $response = $client->request('GET', 'http://localhost:8057', ['bindto' => '127.0.0.1:9876']);
-        $response->getStatusCode();
-
-        $r = new \ReflectionProperty($response, 'handle');
-        $r->setAccessible(true);
-
-        $curlInfo = curl_getinfo($r->getValue($response));
-
-        self::assertSame('127.0.0.1', $curlInfo['local_ip']);
-        self::assertSame(9876, $curlInfo['local_port']);
-    }
-
     public function testTimeoutIsNotAFatalError()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {