bug #30594 [HttpClient] changes minimal php version to use curl push function (XuruDragon)

nicolas-grekas · nicolas-grekas · commit 2ff8c1960960 · 2019-03-18T16:16:35.000+01:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [HttpClient] changes minimal php version to use curl push function | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | Adding some changes to CurlHttpClient to avoid potential bugs in php < 7.2.17 or php < 7.3.4. For more information check these bugs : - https://bugs.php.net/bug.php?id=77747 - https://bugs.php.net/bug.php?id=77535 Resolve by the following commit by Nikic : - php/php-src@97f9fd6 Commits ------- 01a663a [HttpClient] changes minimal php version to use curl push function
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -64,8 +64,8 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
             'dnsCache' => [[], [], []],
         ];
 
-        // Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/76675
-        if (\PHP_VERSION_ID < 70215 || \PHP_VERSION_ID === 70300 || \PHP_VERSION_ID === 70301) {
+        // Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/bug.php?id=77535
+        if (\PHP_VERSION_ID < 70217 || (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70304)) {
             return;
         }
 
@@ -74,8 +74,7 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
             return;
         }
 
-        // Keep a dummy "onPush" reference to work around a refcount bug in PHP
-        curl_multi_setopt($mh, CURLMOPT_PUSHFUNCTION, $multi->onPush = static function ($parent, $pushed, array $rawHeaders) use ($multi) {
+        curl_multi_setopt($mh, CURLMOPT_PUSHFUNCTION, static function ($parent, $pushed, array $rawHeaders) use ($multi) {
             return self::handlePush($parent, $pushed, $rawHeaders, $multi);
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections`
`64`	`64`	`'dnsCache' => [[], [], []],`
`65`	`65`	`];`
`66`	`66`
`67`		`- // Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/76675`
`68`		`- if (\PHP_VERSION_ID < 70215 \|\| \PHP_VERSION_ID === 70300 \|\| \PHP_VERSION_ID === 70301) {`
	`67`	`+ // Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/bug.php?id=77535`
	`68`	`+ if (\PHP_VERSION_ID < 70217 \|\| (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70304)) {`
`69`	`69`	`return;`
`70`	`70`	`}`
`71`	`71`
`@@ -74,8 +74,7 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections`
`74`	`74`	`return;`
`75`	`75`	`}`
`76`	`76`
`77`		`- // Keep a dummy "onPush" reference to work around a refcount bug in PHP`
`78`		`- curl_multi_setopt($mh, CURLMOPT_PUSHFUNCTION, $multi->onPush = static function ($parent, $pushed, array $rawHeaders) use ($multi) {`
	`77`	`+ curl_multi_setopt($mh, CURLMOPT_PUSHFUNCTION, static function ($parent, $pushed, array $rawHeaders) use ($multi) {`
`79`	`78`	`return self::handlePush($parent, $pushed, $rawHeaders, $multi);`
`80`	`79`	`});`
`81`	`80`	`}`