Merge branch '2.2' into 2.3

* 2.2:
  fixed Client when using the terminable event
  Fix problem with Windows file links (backslash in JavaScript string)
  [Security] fixed wrong phpdoc
  [Routing] removed extra argument
  [HttpFoundation] Header `HTTP_X_FORWARDED_PROTO` can contain various values Some proxies use `ssl` instead of `https`, as well as Lighttpd mod_proxy allows value chaining (`https, http`, where `https` is always first when request is encrypted).
  Added doc comments

Conflicts:
	src/Symfony/Component/HttpFoundation/Request.php

1 files changed, 3 insertions, 0 deletions

diff --git a/Http/Firewall.php b/Http/Firewall.php
index 31c1da5..4f1cf30 100644
--- a/Http/Firewall.php
+++ b/Http/Firewall.php
@@ -71,6 +71,9 @@ class Firewall implements EventSubscriberInterface
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public static function getSubscribedEvents()
     {
         return array(KernelEvents::REQUEST => array('onKernelRequest', 8));