diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpClient] Don't use CurlHttpClient on Windows when curl.cainfo is not set

Browse Source
This commit is contained in:
Nicolas Grekas 2019-06-13 13:53:55 +02:00
parent 9526988eca
commit a2960a3318
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/HttpClient/HttpClient.php
View File

@ -32,7 +32,11 @@ final class HttpClient
public static function create(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50): HttpClientInterface
{
if (\extension_loaded('curl')) {
return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);
if ('\\' !== \DIRECTORY_SEPARATOR || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) {
return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);
}
@trigger_error('Configure the "curl.cainfo", "openssl.cafile" or "openssl.capath" php.ini setting to enable the CurlHttpClient', E_USER_WARNING);
}
return new NativeHttpClient($defaultOptions, $maxHostConnections);

2
src/Symfony/Component/HttpClient/Response/CurlResponse.php
View File

@ -336,7 +336,7 @@ final class CurlResponse implements ResponseInterface
return 0;
}
if ($certinfo = curl_getinfo($ch, CURLINFO_CERTINFO)) {
if (\function_exists('openssl_x509_read') && $certinfo = curl_getinfo($ch, CURLINFO_CERTINFO)) {
$info['peer_certificate_chain'] = array_map('openssl_x509_read', array_column($certinfo, 'Cert'));
}