Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 274ff66

Browse filesBrowse files
committed
bug #31569 [HttpClient] Only use CURLMOPT_MAX_HOST_CONNECTIONS & CURL_VERSION_HTTP2 if defined (GawainLynch)
This PR was merged into the 4.3 branch. Discussion ---------- [HttpClient] Only use CURLMOPT_MAX_HOST_CONNECTIONS & CURL_VERSION_HTTP2 if defined | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Regards the constants: - CURLMOPT_MAX_HOST_CONNECTIONS is available since PHP 7.0.7 and cURL 7.30.0 - CURL_VERSION_HTTP2 is available since PHP 5.5.24 and 5.6.8 and cURL 7.33.0 Errors triggered: > Use of undefined constant CURLMOPT_MAX_HOST_CONNECTIONS - assumed 'CURLMOPT_MAX_HOST_CONNECTIONS' > in vendor/symfony/http-client/CurlHttpClient.php (line 73) > Use of undefined constant CURL_VERSION_HTTP2 - assumed 'CURL_VERSION_HTTP2' > in vendor/symfony/http-client/CurlHttpClient.php (line 191) Commits ------- 4ea7283 [HttpClient] Only use CURLMOPT_MAX_HOST_CONNECTIONS & CURL_VERSION_HTTP2 if defined
2 parents 31ba038 + 4ea7283 commit 274ff66
Copy full SHA for 274ff66

File tree

1 file changed

+4
-2
lines changed
Filter options

1 file changed

+4
-2
lines changed

‎src/Symfony/Component/HttpClient/CurlHttpClient.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/CurlHttpClient.php
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
7070
if (\defined('CURLPIPE_MULTIPLEX')) {
7171
curl_multi_setopt($this->multi->handle, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
7272
}
73-
curl_multi_setopt($this->multi->handle, CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX);
73+
if (\defined('CURLMOPT_MAX_HOST_CONNECTIONS')) {
74+
curl_multi_setopt($this->multi->handle, CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX);
75+
}
7476

7577
// Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/bug.php?id=77535
7678
if (0 >= $maxPendingPushes || \PHP_VERSION_ID < 70217 || (\PHP_VERSION_ID >= 70300 && \PHP_VERSION_ID < 70304)) {
@@ -188,7 +190,7 @@ public function request(string $method, string $url, array $options = []): Respo
188190
$curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
189191
} elseif (1.1 === (float) $options['http_version'] || 'https:' !== $scheme) {
190192
$curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
191-
} elseif (CURL_VERSION_HTTP2 & curl_version()['features']) {
193+
} elseif (\defined('CURL_VERSION_HTTP2') && CURL_VERSION_HTTP2 & curl_version()['features']) {
192194
$curlopts[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2_0;
193195
}
194196

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.