bug #38215 [HttpClient] Support for CURLOPT_LOCALPORT (derrabus)

fabpot · fabpot · commit ad226185afa1 · 2020-09-17T06:58:25.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpClient] Support for CURLOPT_LOCALPORT | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #38081 (comment) | License | MIT | Doc PR | N/A Commits ------- 45fa6b8 [HttpClient] Support for CURLOPT_LOCALPORT.
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -267,7 +267,14 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         if ($options['bindto']) {
-            $curlopts[file_exists($options['bindto']) ? \CURLOPT_UNIX_SOCKET_PATH : \CURLOPT_INTERFACE] = $options['bindto'];
+            if (file_exists($options['bindto'])) {
+                $curlopts[\CURLOPT_UNIX_SOCKET_PATH] = $options['bindto'];
+            } elseif (preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {
+                $curlopts[\CURLOPT_INTERFACE] = $matches[1];
+                $curlopts[\CURLOPT_LOCALPORT] = $matches[2];
+            } else {
+                $curlopts[\CURLOPT_INTERFACE] = $options['bindto'];
+            }
         }
 
         if (0 < $options['max_duration']) {
diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -35,6 +35,21 @@ protected function getHttpClient(string $testCase): HttpClientInterface
         return new CurlHttpClient();
     }
 
+    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']);
+    }
+
     /**
      * @requires PHP 7.2.17
      */

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,14 @@ public function request(string $method, string $url, array $options = []): Respo`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`if ($options['bindto']) {`
`270`		`- $curlopts[file_exists($options['bindto']) ? \CURLOPT_UNIX_SOCKET_PATH : \CURLOPT_INTERFACE] = $options['bindto'];`
	`270`	`+ if (file_exists($options['bindto'])) {`
	`271`	`+ $curlopts[\CURLOPT_UNIX_SOCKET_PATH] = $options['bindto'];`
	`272`	`+ } elseif (preg_match('/^(.*):(\d+)$/', $options['bindto'], $matches)) {`
	`273`	`+ $curlopts[\CURLOPT_INTERFACE] = $matches[1];`
	`274`	`+ $curlopts[\CURLOPT_LOCALPORT] = $matches[2];`
	`275`	`+ } else {`
	`276`	`+ $curlopts[\CURLOPT_INTERFACE] = $options['bindto'];`
	`277`	`+ }`
`271`	`278`	`}`
`272`	`279`
`273`	`280`	`if (0 < $options['max_duration']) {`