Skip to content

Commit 29ac690

Browse files
committed
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]>
2 parents b72eab3 + 290eb48 commit 29ac690

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

CurlHttpClient.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
9393
}
9494

9595
// HTTP/2 push crashes before curl 7.61
96-
if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073d00 > self::$curlVersion['version_number'] || !(\CURL_VERSION_HTTP2 & self::$curlVersion['features'])) {
96+
if (!\defined('CURLMOPT_PUSHFUNCTION') || 0x073D00 > self::$curlVersion['version_number'] || !(\CURL_VERSION_HTTP2 & self::$curlVersion['features'])) {
9797
return;
9898
}
9999

@@ -188,7 +188,7 @@ public function request(string $method, string $url, array $options = []): Respo
188188
$this->multi->dnsCache->evictions = [];
189189
$port = parse_url($authority, \PHP_URL_PORT) ?: ('http:' === $scheme ? 80 : 443);
190190

191-
if ($resolve && 0x072a00 > self::$curlVersion['version_number']) {
191+
if ($resolve && 0x072A00 > self::$curlVersion['version_number']) {
192192
// DNS cache removals require curl 7.42 or higher
193193
// On lower versions, we have to create a new multi handle
194194
curl_multi_close($this->multi->handle);

0 commit comments

Comments
 (0)