Merge branch '4.4' into 5.2

derrabus · derrabus · commit c6bd5915c3ed · 2021-04-04T14:43:53.000+02:00
* 4.4:
  allow CurlHttpClient on Windows
  remove references to "Silex"
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);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static function create(array $defaultOptions = [], int $maxHostConnection`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`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')) {`
`54`	`54`	`return new CurlHttpClient($defaultOptions, $maxHostConnections, $maxPendingPushes);`
`55`	`55`	`}`
`56`	`56`