[HttpClient] Fix setting CURLMOPT_MAXCONNECTS

HypeMC · HypeMC · commit 8fe2f2fe3f23 · 2024-09-16T14:08:49.000+02:00
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -118,6 +118,23 @@ jobs:
           KAFKA_CFG_LISTENERS: 'PLAINTEXT://:9092'
           KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper:2181'
         options: --name=kafka
+      frankenphp:
+        image: dunglas/frankenphp:1.1.0
+        ports:
+          - 80:80
+          - 8681:81
+          - 8682:82
+          - 8683:83
+          - 8684:84
+        volumes:
+          - ${{ github.workspace }}:/symfony
+        env:
+          SERVER_NAME: 'http://localhost http://localhost:81 http://localhost:82 http://localhost:83 http://localhost:84'
+          CADDY_SERVER_EXTRA_DIRECTIVES: |
+            route /http-client* {
+              root * /symfony/src/Symfony/Component/HttpClient/Tests/Fixtures/response-functional/
+              php_server
+            }
 
     steps:
       - name: Checkout
diff --git a/src/Symfony/Component/HttpClient/Internal/CurlClientState.php b/src/Symfony/Component/HttpClient/Internal/CurlClientState.php
@@ -53,7 +53,7 @@ public function __construct(int $maxHostConnections, int $maxPendingPushes)
             curl_multi_setopt($this->handle, \CURLMOPT_PIPELINING, \CURLPIPE_MULTIPLEX);
         }
         if (\defined('CURLMOPT_MAX_HOST_CONNECTIONS')) {
-            $maxHostConnections = curl_multi_setopt($this->handle, \CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : \PHP_INT_MAX) ? 0 : $maxHostConnections;
+            $maxHostConnections = curl_multi_setopt($this->handle, \CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : \PHP_INT_MAX) ? 4294967295 : $maxHostConnections;
         }
         if (\defined('CURLMOPT_MAXCONNECTS') && 0 < $maxHostConnections) {
             curl_multi_setopt($this->handle, \CURLMOPT_MAXCONNECTS, $maxHostConnections);
diff --git a/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php
@@ -144,4 +144,34 @@ public function testKeepAuthorizationHeaderOnRedirectToSameHostWithConfiguredHos
         $this->assertSame(200, $response->getStatusCode());
         $this->assertSame('/302', $response->toArray()['REQUEST_URI'] ?? null);
     }
+
+    /**
+     * @group integration
+     */
+    public function testMaxConnections()
+    {
+        foreach ($ports = [80, 8681, 8682, 8683, 8684] as $port) {
+            if (!($fp = @fsockopen('localhost', $port, $errorCode, $errorMessage, 2))) {
+                self::markTestSkipped('FrankenPHP is not running');
+            }
+            fclose($fp);
+        }
+
+        $httpClient = $this->getHttpClient(__FUNCTION__);
+
+        $expectedResults = [
+            [false, false, false, false, false],
+            [true, true, true, true, true],
+            [true, true, true, true, true],
+        ];
+
+        foreach ($expectedResults as $expectedResult) {
+            foreach ($ports as $i => $port) {
+                $response = $httpClient->request('GET', \sprintf('http://localhost:%s/http-client', $port));
+                $response->getContent();
+
+                self::assertSame($expectedResult[$i], str_contains($response->getInfo('debug'), 'Re-using existing connection'));
+            }
+        }
+    }
 }
diff --git a/src/Symfony/Component/HttpClient/Tests/Fixtures/response-functional/index.php b/src/Symfony/Component/HttpClient/Tests/Fixtures/response-functional/index.php
@@ -0,0 +1,12 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+echo 'Success';

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function __construct(int $maxHostConnections, int $maxPendingPushes)`
`53`	`53`	`curl_multi_setopt($this->handle, \CURLMOPT_PIPELINING, \CURLPIPE_MULTIPLEX);`
`54`	`54`	`}`
`55`	`55`	`if (\defined('CURLMOPT_MAX_HOST_CONNECTIONS')) {`
`56`		`- $maxHostConnections = curl_multi_setopt($this->handle, \CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : \PHP_INT_MAX) ? 0 : $maxHostConnections;`
	`56`	`+ $maxHostConnections = curl_multi_setopt($this->handle, \CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : \PHP_INT_MAX) ? 4294967295 : $maxHostConnections;`
`57`	`57`	`}`
`58`	`58`	`if (\defined('CURLMOPT_MAXCONNECTS') && 0 < $maxHostConnections) {`
`59`	`59`	`curl_multi_setopt($this->handle, \CURLMOPT_MAXCONNECTS, $maxHostConnections);`