symfony
diff --git a/‎Test/HttpClientTestCase.php
Copy file name to clipboardExpand all lines: Test/HttpClientTestCase.php
+17-2Lines changed: 17 additions & 2 deletions b/‎Test/HttpClientTestCase.php
Copy file name to clipboardExpand all lines: Test/HttpClientTestCase.php
+17-2Lines changed: 17 additions & 2 deletions
diff --git a/‎Test/TestHttpServer.php
Copy file name to clipboardExpand all lines: Test/TestHttpServer.php
+8-1Lines changed: 8 additions & 1 deletion b/‎Test/TestHttpServer.php
Copy file name to clipboardExpand all lines: Test/TestHttpServer.php
+8-1Lines changed: 8 additions & 1 deletion
@@ -735,6 +735,18 @@ public function testIdnResolve()
         $this->assertSame(200, $response->getStatusCode());
     }
 
+    public function testIPv6Resolve()
+    {
+        TestHttpServer::start(-8087, '[::1]');
+
+        $client = $this->getHttpClient(__FUNCTION__);
+        $response = $client->request('GET', 'http://symfony.com:8087/', [
+            'resolve' => ['symfony.com' => '::1'],
+        ]);
+
+        $this->assertSame(200, $response->getStatusCode());
+    }
+
     public function testNotATimeout()
     {
         $client = $this->getHttpClient(__FUNCTION__);
@@ -1168,7 +1180,7 @@ public function testBindToPort()
 
     public function testBindToPortV6()
     {
-        TestHttpServer::start(8087, '[::1]');
+        TestHttpServer::start(-8087);
 
         $client = $this->getHttpClient(__FUNCTION__);
         $response = $client->request('GET', 'http://[::1]:8087', ['bindto' => '[::1]:9876']);
@@ -1177,6 +1189,9 @@ public function testBindToPortV6()
         $vars = $response->toArray();
 
         self::assertSame('::1', $vars['REMOTE_ADDR']);
-        self::assertSame('9876', $vars['REMOTE_PORT']);
+
+        if ('\\' !== \DIRECTORY_SEPARATOR) {
+            self::assertSame('9876', $vars['REMOTE_PORT']);
+        }
     }
 }
@@ -21,8 +21,15 @@ class TestHttpServer
     /**
      * @return Process
      */
-    public static function start(int $port = 8057, $ip = '127.0.0.1')
+    public static function start(int $port = 8057)
     {
+        if (0 > $port) {
+            $port = -$port;
+            $ip = '[::1]';
+        } else {
+            $ip = '127.0.0.1';
+        }
+
         if (isset(self::$process[$port])) {
             self::$process[$port]->stop();
         } else {