bug #33985 [HttpClient] workaround curl_multi_select() issue (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 0c772969b43a · 2019-10-15T14:31:27.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] workaround curl_multi_select() issue | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - 1) Symfony\Component\HttpClient\Tests\CurlHttpClientTest::testNotATimeout Symfony\Component\HttpClient\Exception\TransportException: Reading from the response stream reached the idle timeout. Commits ------- e635491 [HttpClient] workaround curl_multi_select() issue
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -48,7 +48,6 @@ install:
     - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
     - git config --global user.email ""
     - git config --global user.name "Symfony"
-    - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
     - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
     - IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
     - php composer.phar update --no-progress --no-suggest --ansi
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -274,6 +274,11 @@ private static function perform(CurlClientState $multi, array &$responses = null
      */
     private static function select(CurlClientState $multi, float $timeout): int
     {
+        if (\PHP_VERSION_ID < 70123 || (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {
+            // workaround https://bugs.php.net/76480
+            $timeout = min($timeout, 0.01);
+        }
+
         return curl_multi_select($multi->handle, $timeout);
     }
 
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -597,9 +597,9 @@ public function testNotATimeout()
     {
         $client = $this->getHttpClient(__FUNCTION__);
         $response = $client->request('GET', 'http://localhost:8057/timeout-header', [
-            'timeout' => 0.5,
+            'timeout' => 0.9,
         ]);
-        usleep(510000);
+        sleep(1);
         $this->assertSame(200, $response->getStatusCode());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,11 @@ private static function perform(CurlClientState $multi, array &$responses = null`
`274`	`274`	`*/`
`275`	`275`	`private static function select(CurlClientState $multi, float $timeout): int`
`276`	`276`	`{`
	`277`	`+ if (\PHP_VERSION_ID < 70123 \|\| (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {`
	`278`	`+ // workaround https://bugs.php.net/76480`
	`279`	`+ $timeout = min($timeout, 0.01);`
	`280`	`+ }`
	`281`	`+`
`277`	`282`	`return curl_multi_select($multi->handle, $timeout);`
`278`	`283`	`}`
`279`	`284`
Original file line number	Diff line number	Diff line change
`@@ -597,9 +597,9 @@ public function testNotATimeout()`
`597`	`597`	`{`
`598`	`598`	`$client = $this->getHttpClient(__FUNCTION__);`
`599`	`599`	`$response = $client->request('GET', 'http://localhost:8057/timeout-header', [`
`600`		`- 'timeout' => 0.5,`
	`600`	`+ 'timeout' => 0.9,`
`601`	`601`	`]);`
`602`		`- usleep(510000);`
	`602`	`+ sleep(1);`
`603`	`603`	`$this->assertSame(200, $response->getStatusCode());`
`604`	`604`	`}`
`605`	`605`