BBlack has uploaded a new change for review.

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

Change subject: sanitize Accept-Encoding for cache efficiency T97128
......................................................................

sanitize Accept-Encoding for cache efficiency T97128

Change-Id: I0a622b4297e240c7c0540bd257ec64fb9db4ea97
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 19 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/206387/1

diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 827b3ab..b5ab401 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -259,6 +259,23 @@
        }
 }
 
+# Cribbed directly from 
https://www.varnish-cache.org/docs/3.0/tutorial/vary.html
+sub vcl_recv_sanitize_ae {
+       if (req.http.Accept-Encoding) {
+               if (req.url ~ "\.(jpg|png|gif|gz|tgz|bz2|tbz|mp3|ogg)$") {
+                       # No point in compressing these
+                       remove req.http.Accept-Encoding;
+               } elsif (req.http.Accept-Encoding ~ "gzip") {
+                       set req.http.Accept-Encoding = "gzip";
+               } elsif (req.http.Accept-Encoding ~ "deflate") {
+                       set req.http.Accept-Encoding = "deflate";
+               } else {
+                       # unknown algorithm
+                       remove req.http.Accept-Encoding;
+               }
+       }
+}
+
 <% if ! @wikimedia_networks.empty? -%>
 sub restrict_access {
        if (client.ip !~ wikimedia_nets) {
@@ -293,6 +310,8 @@
 <% end -%>
        call vcl_recv_append_xff;
 
+       call vcl_recv_sanitize_ae;
+
        if ( req.http.host ~ "^varnishcheck" ) {
                error 200 "OK"; 
        }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a622b4297e240c7c0540bd257ec64fb9db4ea97
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to