Faidon Liambotis has submitted this change and it was merged.
Change subject: varnish: remove temp cache fix for zero
......................................................................
varnish: remove temp cache fix for zero
Change-Id: I35d71b07dae161b41c603b90bd3a5798d2c31b3f
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 0 insertions(+), 9 deletions(-)
Approvals:
Faidon Liambotis: 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 260e9fa..97fae7b 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -139,15 +139,6 @@
# unset resp.http.Enable-ESI;
unset resp.http.X-CS;
- # We used to incorrectly set them in vcl_fetch(), which means that our
- # cache is now poisoned with non-varied cached objects that have this
- # incorrectly set with random carriers. Clean up after ourselves.
- # FIXME: remove after cache expires, Sep 26 2013 + 30 days
- if (resp.http.Vary !~ "X-CS" && resp.http.X-Analytics ~ "zero=") {
- # no Vary: X-CS and zero in X-Analytics is an invalid
combination
- unset resp.http.X-Analytics;
- }
-
if (resp.http.X-Analytics) {
# do nothing, MediaWiki has handled X-Analytics
} else if (req.http.X-Analytics) {
--
To view, visit https://gerrit.wikimedia.org/r/92288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35d71b07dae161b41c603b90bd3a5798d2c31b3f
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
