Matanya has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/92288


Change subject: removing cache clean up patch
......................................................................

removing cache clean up patch

Change-Id: I35d71b07dae161b41c603b90bd3a5798d2c31b3f
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 0 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/92288/1

diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb 
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 8ca1f53..df8c2c8 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -148,22 +148,6 @@
 
 sub vcl_deliver {
 #      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) {
-               set resp.http.X-Analytics = req.http.X-Analytics;
-       }
 
        if (resp.http.Cache-Control ~ "s-maxage=[1-9]") {
                set resp.http.Cache-Control = "s-maxage=300, must-revalidate, 
max-age=0";

-- 
To view, visit https://gerrit.wikimedia.org/r/92288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I35d71b07dae161b41c603b90bd3a5798d2c31b3f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to