Skip to content

Commit 8da5db9

Browse files
committed
Merge pull request #155 from FriendsOfSymfony/remove-duplicated-vcl
remove duplicated line from varnish 3 vcl
2 parents 42af71c + 4654017 commit 8da5db9

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

doc/varnish-configuration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ to the ``recv`` and the ``deliver`` methods:
124124

125125
.. literalinclude:: ../tests/Functional/Fixtures/varnish-3/user_context.vcl
126126
:language: varnish3
127-
:lines: 1-28, 32-
127+
:lines: 1-27, 31-
128128
:linenos:
129129

130130
.. sidebar:: Caching User Specific Content
131131

132132
By default, Varnish does not check for cached data as soon as the request
133-
has a ``Cookie`` or ``Authorization`` header, as per the `builtin VCL`_
133+
has a ``Cookie`` or ``Authorization`` header, as per the `builtin VCL`_
134134
(for Varnish 3, see `default VCL`_). For the user context, you make Varnish
135135
cache even when there are credentials present.
136136

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ sub vcl_recv {
1616
&& (req.http.cookie || req.http.authorization)
1717
&& (req.request == "GET" || req.request == "HEAD")
1818
) {
19-
set req.http.x-fos-original-url = req.url;
2019
# Backup accept header, if set
2120
if (req.http.accept) {
2221
set req.http.x-fos-original-accept = req.http.accept;
@@ -26,7 +25,7 @@ sub vcl_recv {
2625
# Backup original URL
2726
set req.http.x-fos-original-url = req.url;
2827
set req.url = "/user_context_hash.php";
29-
28+
3029
# For functional tests
3130
call user_context_hash_url;
3231

0 commit comments

Comments
 (0)