allow CurlHttpClient on Windows

n0rbyt3 · web-flow · commit 6609a175f2a7 · 2021-04-03T19:46:18.000+02:00
diff --git a/src/Symfony/Component/HttpClient/HttpClient.php b/src/Symfony/Component/HttpClient/HttpClient.php
@@ -30,7 +30,7 @@ final class HttpClient
     public static function create(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50): HttpClientInterface
     {
         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);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ final class HttpClient`
`30`	`30`	`public static function create(array $defaultOptions = [], int $maxHostConnections = 6, int $maxPendingPushes = 50): HttpClientInterface`
`31`	`31`	`{`
`32`	`32`	`if (\extension_loaded('curl')) {`
`33`		`- if ('\\' !== \DIRECTORY_SEPARATOR \|\| ini_get('curl.cainfo') \|\| ini_get('openssl.cafile') \|\| ini_get('openssl.capath')) {`
	`33`	`+ if ('\\' !== \DIRECTORY_SEPARATOR \|\| isset($defaultOptions['cafile']) \|\| isset($defaultOptions['capath']) \|\| ini_get('curl.cainfo') \|\| ini_get('openssl.cafile') \|\| ini_get('openssl.capath')) {`
`34`	`34`	`return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);`
`35`	`35`	`}`
`36`	`36`