Faidon has submitted this change and it was merged.
Change subject: Minor fix to base decision on X-CS, not X-Carrier
......................................................................
Minor fix to base decision on X-CS, not X-Carrier
* Base decisions on X-CS, not on obsolete X-Carrier
* fixed comments: X-Carrier is the obsolete header, not X-CS
Change-Id: I814c127fac957012fba94c0ceecb00041eac4aed
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 2 insertions(+), 9 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 703c58f..54ce1c4 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -20,13 +20,6 @@
set req.http.X-Analytics = "zero=" + req.http.X-CS;
}
- /*
- TODO: X-CS is retained here (as the antecedent to X-Analytics),
- but should be removed as soon as X-Analytics is confirmed working
- and all upstream users of X-CS are modified to use the X-Analytics
- header instead.
- */
-
/* Replace <language>.(m|zero).<project>.org by
<language>.<project>.org */
set req.http.host = regsub(req.http.host,
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
@@ -65,7 +58,7 @@
}
if (req.http.host == "m.wikipedia.org") {
- if (req.http.X-Carrier) {
+ if (req.http.X-CS) {
// Carrier detected
error 666 "http://"; + req.http.X-DfltLang +
".m.wikipedia.org" + req.http.X-DfltPage;
} else {
@@ -92,8 +85,8 @@
sub vcl_fetch {
set beresp.http.X-Device = req.http.X-Device;
+ /* TODO: remove X-Carrier header */
set beresp.http.X-Carrier = req.http.X-Carrier;
- /* TODO: remove X-CS header */
set beresp.http.X-CS = req.http.X-CS;
if ( beresp.http.X-Analytics ) {
# Do nothing, X-Analytics has already been handled
--
To view, visit https://gerrit.wikimedia.org/r/67214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I814c127fac957012fba94c0ceecb00041eac4aed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
