Merge branch '4.4' into 5.2

derrabus · derrabus · commit 58fa56f3590a · 2021-04-04T14:43:53.000+02:00
* 4.4:
  allow CurlHttpClient on Windows
  remove references to "Silex"
diff --git a/src/Symfony/Component/HttpClient/HttpClient.php b/src/Symfony/Component/HttpClient/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);
             }
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php
@@ -113,9 +113,8 @@ public function save()
             $this->data = $data;
         }
 
-        // this is needed for Silex, where the session object is re-used across requests
-        // in functional tests. In Symfony, the container is rebooted, so we don't have
-        // this issue
+        // this is needed when the session object is re-used across multiple requests
+        // in functional tests.
         $this->started = false;
     }
 
diff --git a/src/Symfony/Component/HttpKernel/README.md b/src/Symfony/Component/HttpKernel/README.md
@@ -3,8 +3,7 @@ HttpKernel Component
 
 The HttpKernel component provides a structured process for converting a Request
 into a Response by making use of the EventDispatcher component. It's flexible
-enough to create a full-stack framework (Symfony), a micro-framework (Silex) or
-an advanced CMS system (Drupal).
+enough to create full-stack frameworks, micro-frameworks or advanced CMS systems like Drupal.
 
 Resources
 ---------

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`
Original file line number	Diff line number	Diff line change
`@@ -113,9 +113,8 @@ public function save()`
`113`	`113`	`$this->data = $data;`
`114`	`114`	`}`
`115`	`115`
`116`		`- // this is needed for Silex, where the session object is re-used across requests`
`117`		`- // in functional tests. In Symfony, the container is rebooted, so we don't have`
`118`		`- // this issue`
	`116`	`+ // this is needed when the session object is re-used across multiple requests`
	`117`	`+ // in functional tests.`
`119`	`118`	`$this->started = false;`
`120`	`119`	`}`
`121`	`120`