public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Avoid using curl when it has been disabled, fixes #9423

pull/9426/head
Jordi Boggiano 2020-11-06 12:55:54 +01:00
parent 4b8e77b2da
commit 3f6899946b
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Command/DiagnoseCommand.php
View File

@ -379,7 +379,11 @@ EOT
private function getCurlVersion()
{
if (function_exists('curl_version')) {
if (extension_loaded('curl')) {
if (!HttpDownloader::isCurlEnabled()) {
return '<error>disabled via disable_functions, using php streams fallback, which reduces performance</error>';
}
$version = curl_version();
return '<comment>'.$version['version'].'</comment> '.

8
src/Composer/Util/HttpDownloader.php
View File

@ -67,8 +67,7 @@ class HttpDownloader
$this->options = array_replace_recursive($this->options, $options);
$this->config = $config;
// TODO enable curl only on 5.6+ if older versions cause any problem
if (extension_loaded('curl')) {
if (self::isCurlEnabled()) {
$this->curl = new Http\CurlDownloader($io, $config, $options, $disableTls);
}
@ -423,4 +422,9 @@ class HttpDownloader
return true;
}
public static function isCurlEnabled()
{
return \extension_loaded('curl') && \function_exists('curl_multi_exec') && \function_exists('curl_multi_init');
}
}