Skip to content

Commit

Permalink
Merge branch '4.4' into 5.3
Browse files Browse the repository at this point in the history
* 4.4:
  [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait`
  Fix CS
  • Loading branch information
derrabus committed Nov 4, 2021
2 parents 710b69e + fe90558 commit 290eb48
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CurlHttpClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 290eb48

Please sign in to comment.