From d30943c2e86713b32b12cd6e2e2801dac845aee9 Mon Sep 17 00:00:00 2001
From: "marc.weistroff" <marc.weistroff@sensio.com>
Date: Thu, 26 Jul 2012 11:04:47 +0200
Subject: [PATCH] [FrameworkBundle] Switched to parameters for request context
 host and scheme

---
 UPGRADE-2.1.md                                              | 5 +++++
 .../Bundle/FrameworkBundle/Resources/config/routing.xml     | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/UPGRADE-2.1.md b/UPGRADE-2.1.md
index 7473cb37b8..5ad681a7e9 100644
--- a/UPGRADE-2.1.md
+++ b/UPGRADE-2.1.md
@@ -1353,6 +1353,11 @@
     decoded twice before. Note that the `urldecode()` calls have been changed for a
     single `rawurldecode()` in order to support `+` for input paths.
 
+  * Two new parameters have been added to the DIC: `router.request_context.host`
+    and `router.request_context.scheme`.  You can customize them for your
+    functional tests or for generating urls with the right host and scheme
+    when your are in the cli context.
+
 ### FrameworkBundle
 
   * session options: lifetime, path, domain, secure, httponly were deprecated.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
index d4d181a8fd..ff6c6f5851 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
@@ -22,6 +22,8 @@
         <parameter key="router.options.matcher.cache_class">%kernel.name%%kernel.environment%UrlMatcher</parameter>
         <parameter key="router.options.generator.cache_class">%kernel.name%%kernel.environment%UrlGenerator</parameter>
         <parameter key="router_listener.class">Symfony\Component\HttpKernel\EventListener\RouterListener</parameter>
+        <parameter key="router.request_context.host">localhost</parameter>
+        <parameter key="router.request_context.scheme">http</parameter>
     </parameters>
 
     <services>
@@ -74,8 +76,8 @@
         <service id="router.request_context" class="%router.request_context.class%" public="false">
             <argument></argument>
             <argument>GET</argument>
-            <argument>localhost</argument>
-            <argument>http</argument>
+            <argument>%router.request_context.host%</argument>
+            <argument>%router.request_context.scheme%</argument>
             <argument>%request_listener.http_port%</argument>
             <argument>%request_listener.https_port%</argument>
         </service>