Merge pull request #86 from FriendsOfSymfony/lookup-origin-url

do not use x-original-url for backing up the url.

Author: dbu

doc/varnish-configuration.rst

@@ -152,6 +152,13 @@ Varnish 4
 Your backend application should respond to the ``application/vnd.fos.user-context-hash``
 request with :ref:`a proper user hash <return context hash>`.
 
+.. note::
+
+    We do not use ``x-original-url`` here, as the header will be sent to the
+    backend and some applications look at this header, which would lead to
+    problems. For example, the Microsoft IIS rewriting module uses this header
+    and Symfony2 has to look into that header to support IIS.
+
 .. note::
 
     If you want the context hash to be cached, you need to always set the

tests/Functional/Fixtures/varnish-3/user_context.vcl

@@ -14,8 +14,8 @@ sub vcl_recv {
         && (req.http.cookie || req.http.authorization)
         && (req.request == "GET" || req.request == "HEAD")
     ) {
-        set req.http.x-original-url    = req.url;
-        set req.http.x-original-accept = req.http.accept;
+        set req.http.x-fos-original-url    = req.url;
+        set req.http.x-fos-original-accept = req.http.accept;
 
         set req.http.accept            = "application/vnd.fos.user-context-hash";
 
@@ -38,11 +38,11 @@ sub vcl_recv {
     if (req.restarts > 0
         && req.http.accept == "application/vnd.fos.user-context-hash"
     ) {
-        set req.url         = req.http.x-original-url;
-        set req.http.accept = req.http.x-original-accept;
+        set req.url         = req.http.x-fos-original-url;
+        set req.http.accept = req.http.x-fos-original-accept;
 
-        unset req.http.x-original-url;
-        unset req.http.x-original-accept;
+        unset req.http.x-fos-original-url;
+        unset req.http.x-fos-original-accept;
 
         # Force the lookup, the backend must tell not to cache or vary on the
         # user hash to properly separate cached data.

tests/Functional/Fixtures/varnish-4/user_context.vcl

@@ -16,8 +16,8 @@ sub vcl_recv {
         && (req.http.cookie || req.http.authorization)
         && (req.method == "GET" || req.method == "HEAD")
     ) {
-        set req.http.x-original-url    = req.url;
-        set req.http.x-original-accept = req.http.accept;
+        set req.http.x-fos-original-url    = req.url;
+        set req.http.x-fos-original-accept = req.http.accept;
 
         set req.http.accept            = "application/vnd.fos.user-context-hash";
 
@@ -40,11 +40,11 @@ sub vcl_recv {
     if (req.restarts > 0
         && req.http.accept == "application/vnd.fos.user-context-hash"
     ) {
-        set req.url         = req.http.x-original-url;
-        set req.http.accept = req.http.x-original-accept;
+        set req.url         = req.http.x-fos-original-url;
+        set req.http.accept = req.http.x-fos-original-accept;
 
-        unset req.http.x-original-url;
-        unset req.http.x-original-accept;
+        unset req.http.x-fos-original-url;
+        unset req.http.x-fos-original-accept;
 
         # Force the lookup, the backend must tell not to cache or vary on the
         # user hash to properly separate cached data.