Merge pull request #155 from FriendsOfSymfony/remove-duplicated-vcl

remove duplicated line from varnish 3 vcl
FriendsOfSymfony · Jan 17, 2015 · 8da5db9 · 8da5db9
2 parents 42af71c + 4654017
commit 8da5db9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/doc/varnish-configuration.rst b/doc/varnish-configuration.rst
@@ -124,13 +124,13 @@ to the ``recv`` and the ``deliver`` methods:
 
     .. literalinclude:: ../tests/Functional/Fixtures/varnish-3/user_context.vcl
         :language: varnish3
-        :lines: 1-28, 32-
+        :lines: 1-27, 31-
         :linenos:
 
 .. sidebar:: Caching User Specific Content
 
     By default, Varnish does not check for cached data as soon as the request
-    has a ``Cookie`` or ``Authorization`` header, as per the `builtin VCL`_ 
+    has a ``Cookie`` or ``Authorization`` header, as per the `builtin VCL`_
     (for Varnish 3, see `default VCL`_). For the user context, you make Varnish
     cache even when there are credentials present.
 

diff --git a/tests/Functional/Fixtures/varnish-3/user_context.vcl b/tests/Functional/Fixtures/varnish-3/user_context.vcl
@@ -16,7 +16,6 @@ sub vcl_recv {
         && (req.http.cookie || req.http.authorization)
         && (req.request == "GET" || req.request == "HEAD")
     ) {
-        set req.http.x-fos-original-url = req.url;
         # Backup accept header, if set
         if (req.http.accept) {
             set req.http.x-fos-original-accept = req.http.accept;
@@ -26,7 +25,7 @@ sub vcl_recv {
         # Backup original URL
         set req.http.x-fos-original-url = req.url;
         set req.url = "/user_context_hash.php";
-        
+
         # For functional tests
         call user_context_hash_url;