Faidon Liambotis has submitted this change and it was merged.
Change subject: VCL: Use header.append() in more places.
......................................................................
VCL: Use header.append() in more places.
Change-Id: I0d9e238e770de446de55b5d6f652b997d785e229
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
M templates/varnish/via.inc.vcl.erb
2 files changed, 1 insertion(+), 9 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 7699a07..9522dfe 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -2,10 +2,6 @@
# This file is managed by Puppet!
import std;
-
-# this is needed by geoip.inc.vcl and zero.inc.vcl, and in general is the only
-# way to sanely do Set-Cookie in the face of multiple independent cookies
-# being set from different code.
import header;
<%
diff --git a/templates/varnish/via.inc.vcl.erb
b/templates/varnish/via.inc.vcl.erb
index 1736d7e..073c7ea 100644
--- a/templates/varnish/via.inc.vcl.erb
+++ b/templates/varnish/via.inc.vcl.erb
@@ -8,11 +8,7 @@
// zero.inc.vcl.erb alone. See the notes at the top of
mobile-frontend.inc.vcl.erb and
// text-frontend.inc.vcl.erb for more context.
if (req.http.Via ~ "(?i)Internet\.org") {
- if (resp.http.X-Analytics) {
- set resp.http.X-Analytics = resp.http.X-Analytics +
";proxy=IORG";
- } else {
- set resp.http.X-Analytics = "proxy=IORG";
- }
+ header.append(resp.http.X-Analytics, "proxy=IORG");
}
}
--
To view, visit https://gerrit.wikimedia.org/r/184567
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d9e238e770de446de55b5d6f652b997d785e229
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
