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"
symfony · Apr 4, 2021 · bf21bef · bf21bef
2 parents 710f6fa + c6bd591
commit bf21bef
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/HttpClient.php b/HttpClient.php
@@ -50,7 +50,7 @@ public static function create(array $defaultOptions = [], int $maxHostConnection
         }
 
         if (\extension_loaded('curl')) {
-            if ('\\' !== \DIRECTORY_SEPARATOR || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) {
+            if ('\\' !== \DIRECTORY_SEPARATOR || isset($defaultOptions['cafile']) || isset($defaultOptions['capath']) || ini_get('curl.cainfo') || ini_get('openssl.cafile') || ini_get('openssl.capath')) {
                 return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);
             }