symfony
diff --git a/‎src/Symfony/Component/HttpClient/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/HttpClient/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/HttpClient/HttpClient.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/HttpClient.php
+24Lines changed: 24 additions & 0 deletions b/‎src/Symfony/Component/HttpClient/HttpClient.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/HttpClient.php
+24Lines changed: 24 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpClient/Tests/HttpClientTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Tests/HttpClientTest.php
+3-3Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/HttpClient/Tests/HttpClientTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Tests/HttpClientTest.php
+3-3Lines changed: 3 additions & 3 deletions
@@ -7,6 +7,7 @@ CHANGELOG
  * added `NoPrivateNetworkHttpClient` decorator
  * added `AmpHttpClient`, a portable HTTP/2 implementation based on Amp
  * added `LoggerAwareInterface` to `ScopingHttpClient` and `TraceableHttpClient`
+ * made `HttpClient::create()` return an `AmpHttpClient` when `amphp/http-client` is found but curl is not or too old
 
 4.4.0
 -----
 
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpClient;
 
+use Amp\Http\Client\Connection\ConnectionLimitingPool;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 /**
@@ -29,6 +30,25 @@ final class HttpClient
      */
     public static function create(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50): HttpClientInterface
     {
+        if ($amp = class_exists(ConnectionLimitingPool::class)) {
+            if (!\extension_loaded('curl')) {
+                return new AmpHttpClient($defaultOptions, null, $maxHostConnections, $maxPendingPushes);
+            }
+
+            // Skip curl when HTTP/2 push is unsupported or buggy, see https://bugs.php.net/77535
+            if (\PHP_VERSION_ID < 70217 || (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70304) || !\defined('CURLMOPT_PUSHFUNCTION')) {
+                return new AmpHttpClient($defaultOptions, null, $maxHostConnections, $maxPendingPushes);
+            }
+
+            static $curlVersion = null;
+            $curlVersion = $curlVersion ?? curl_version();
+
+            // HTTP/2 push crashes before curl 7.61
+            if (0x073d00 > $curlVersion['version_number'] || !(CURL_VERSION_HTTP2 & $curlVersion['features'])) {
+                return new AmpHttpClient($defaultOptions, null, $maxHostConnections, $maxPendingPushes);
+            }
+        }
+
         if (\extension_loaded('curl')) {
             if ('\\' !== \DIRECTORY_SEPARATOR || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) {
                 return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);
@@ -37,6 +57,10 @@ public static function create(array $defaultOptions = [], int $maxHostConnection
             @trigger_error('Configure the "curl.cainfo", "openssl.cafile" or "openssl.capath" php.ini setting to enable the CurlHttpClient', E_USER_WARNING);
         }
 
+        if ($amp) {
+            return new AmpHttpClient($defaultOptions, null, $maxHostConnections, $maxPendingPushes);
+        }
+
         return new NativeHttpClient($defaultOptions, $maxHostConnections);
     }
 
 
@@ -12,18 +12,18 @@
 namespace Symfony\Component\HttpClient\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\AmpHttpClient;
 use Symfony\Component\HttpClient\CurlHttpClient;
 use Symfony\Component\HttpClient\HttpClient;
-use Symfony\Component\HttpClient\NativeHttpClient;
 
 class HttpClientTest extends TestCase
 {
     public function testCreateClient()
     {
-        if (\extension_loaded('curl') && ('\\' !== \DIRECTORY_SEPARATOR || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath'))) {
+        if (\extension_loaded('curl') && ('\\' !== \DIRECTORY_SEPARATOR || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) && 0x073d00 <= curl_version()['version_number']) {
             $this->assertInstanceOf(CurlHttpClient::class, HttpClient::create());
         } else {
-            $this->assertInstanceOf(NativeHttpClient::class, HttpClient::create());
+            $this->assertInstanceOf(AmpHttpClient::class, HttpClient::create());
         }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -12,18 +12,18 @@`
`12`	`12`	`namespace Symfony\Component\HttpClient\Tests;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Component\HttpClient\AmpHttpClient;`
`15`	`16`	`use Symfony\Component\HttpClient\CurlHttpClient;`
`16`	`17`	`use Symfony\Component\HttpClient\HttpClient;`
`17`		`-use Symfony\Component\HttpClient\NativeHttpClient;`
`18`	`18`
`19`	`19`	`class HttpClientTest extends TestCase`
`20`	`20`	`{`
`21`	`21`	`public function testCreateClient()`
`22`	`22`	`{`
`23`		`- if (\extension_loaded('curl') && ('\\' !== \DIRECTORY_SEPARATOR \|\| ini_get('curl.cainfo') \|\| ini_get('openssl.cafile') \|\| ini_get('openssl.capath'))) {`
	`23`	`+ if (\extension_loaded('curl') && ('\\' !== \DIRECTORY_SEPARATOR \|\| ini_get('curl.cainfo') \|\| ini_get('openssl.cafile') \|\| ini_get('openssl.capath')) && 0x073d00 <= curl_version()['version_number']) {`
`24`	`24`	`$this->assertInstanceOf(CurlHttpClient::class, HttpClient::create());`
`25`	`25`	`} else {`
`26`		`- $this->assertInstanceOf(NativeHttpClient::class, HttpClient::create());`
	`26`	`+ $this->assertInstanceOf(AmpHttpClient::class, HttpClient::create());`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`