Skip to content

Commit bf21bef

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: added missing gitattributes and gitignore allow CurlHttpClient on Windows [Security] Mark ExpiredLoginLinkStorage as experimental remove references to "Silex"
2 parents 710f6fa + c6bd591 commit bf21bef

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

HttpClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static function create(array $defaultOptions = [], int $maxHostConnection
5050
}
5151

5252
if (\extension_loaded('curl')) {
53-
if ('\\' !== \DIRECTORY_SEPARATOR || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) {
53+
if ('\\' !== \DIRECTORY_SEPARATOR || isset($defaultOptions['cafile']) || isset($defaultOptions['capath']) || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) {
5454
return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);
5555
}
5656

0 commit comments

Comments
 (0)