Merge branch '5.3' into 5.4

* 5.3: [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait` Fix CS [Intl] Update the ICU data to 70.1 Default access_decision_manager.strategy option with merge. Signed-off-by: Alexander M. Turek <[email protected]>
symfony · Nov 4, 2021 · 29ac690 · 29ac690
2 parents b72eab3 + 290eb48
commit 29ac690
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CurlHttpClient.php b/CurlHttpClient.php
@@ -93,7 +93,7 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
         }
 
         // HTTP/2 push crashes before curl 7.61
-        if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073d00 > self::$curlVersion['version_number'] || !(\CURL_VERSION_HTTP2 & self::$curlVersion['features'])) {
+        if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073D00 > self::$curlVersion['version_number'] || !(\CURL_VERSION_HTTP2 & self::$curlVersion['features'])) {
             return;
         }
 
@@ -188,7 +188,7 @@ public function request(string $method, string $url, array $options = []): Respo
             $this->multi->dnsCache->evictions = [];
             $port = parse_url($authority, \PHP_URL_PORT) ?: ('http:' === $scheme ? 80 : 443);
 
-            if ($resolve && 0x072a00 > self::$curlVersion['version_number']) {
+            if ($resolve && 0x072A00 > self::$curlVersion['version_number']) {
                 // DNS cache removals require curl 7.42 or higher
                 // On lower versions, we have to create a new multi handle
                 curl_multi_close($this->multi->handle);