Skip to content

Commit c6a3c1e

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: (27 commits) feat: add completion for DebugAutowiring search argument [Routing] Add support for aliasing routes [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait` Fix CS [Console] Open CompleteCommand for custom outputs [Intl] Update the ICU data to 70.1 [Messenger] Add completion for failed messages commands. Fix tests Fixing missing full_stack variable that's needed by toolbar.html.twig [PropertyInfo] Bump phpstan/phpdoc-parser [Security] Backport type fixes [VarExporter] escape unicode chars involved in directionality [Framework] Add completion to debug:container [Messenger] Add completion to command messenger:consume [Intl] Update the ICU data to 70.1 Fix more generic types Default access_decision_manager.strategy option with merge. Fix typos Update validators.ca.xlf Add missing Validator translations for Estonian ... Signed-off-by: Alexander M. Turek <[email protected]>
2 parents efcd218 + 29ac690 commit c6a3c1e

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
@@ -91,7 +91,7 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
9191
}
9292

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

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

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

0 commit comments

Comments
 (0)