Merge branch '4.4' into 5.2

* 4.4:
  allow CurlHttpClient on Windows
  remove references to "Silex"

src/Symfony/Component/HttpClient/HttpClient.php

@@ -50,7 +50,7 @@ final class HttpClient
         }
 
         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);
             }
 

src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php

@@ -113,9 +113,8 @@ class MockFileSessionStorage extends MockArraySessionStorage
             $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;
     }
 

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
 ---------