Copy Accept-Encoding normalisation from EC2 Varnish

alphagov · May 19, 2022 · a3e7619 · a3e7619
1 parent 9d27cd7
commit a3e7619
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 0 deletions.
diff --git a/spec/test-outputs/www-eks-integration.out.vcl b/spec/test-outputs/www-eks-integration.out.vcl
@@ -58,6 +58,15 @@ sub vcl_recv {
 
 
 
+
+  # Strip Accept-Encoding header if the content is already compressed
+  if (req.http.Accept-Encoding) {
+    if (req.url ~ "\.(jpeg|jpg|png|gif|gz|tgz|bz2|tbz|zip|flv|pdf|mp3|ogg)$") {
+      remove req.http.Accept-Encoding;
+    }
+  }
+
+
   # Force SSL.
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";

diff --git a/spec/test-outputs/www-eks-production.out.vcl b/spec/test-outputs/www-eks-production.out.vcl
@@ -151,6 +151,8 @@ sub vcl_recv {
 
 
 
+
+
   # Force SSL.
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";

diff --git a/spec/test-outputs/www-eks-staging.out.vcl b/spec/test-outputs/www-eks-staging.out.vcl
@@ -159,6 +159,15 @@ sub vcl_recv {
 
 
 
+
+  # Strip Accept-Encoding header if the content is already compressed
+  if (req.http.Accept-Encoding) {
+    if (req.url ~ "\.(jpeg|jpg|png|gif|gz|tgz|bz2|tbz|zip|flv|pdf|mp3|ogg)$") {
+      remove req.http.Accept-Encoding;
+    }
+  }
+
+
   # Force SSL.
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";

diff --git a/spec/test-outputs/www-eks-test.out.vcl b/spec/test-outputs/www-eks-test.out.vcl
@@ -55,6 +55,15 @@ sub vcl_recv {
 
 
 
+
+  # Strip Accept-Encoding header if the content is already compressed
+  if (req.http.Accept-Encoding) {
+    if (req.url ~ "\.(jpeg|jpg|png|gif|gz|tgz|bz2|tbz|zip|flv|pdf|mp3|ogg)$") {
+      remove req.http.Accept-Encoding;
+    }
+  }
+
+
   # Force SSL.
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";

diff --git a/spec/test-outputs/www-integration.out.vcl b/spec/test-outputs/www-integration.out.vcl
@@ -58,6 +58,15 @@ sub vcl_recv {
 
 
 
+
+  # Strip Accept-Encoding header if the content is already compressed
+  if (req.http.Accept-Encoding) {
+    if (req.url ~ "\.(jpeg|jpg|png|gif|gz|tgz|bz2|tbz|zip|flv|pdf|mp3|ogg)$") {
+      remove req.http.Accept-Encoding;
+    }
+  }
+
+
   # Force SSL.
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";

diff --git a/spec/test-outputs/www-production.out.vcl b/spec/test-outputs/www-production.out.vcl
@@ -151,6 +151,8 @@ sub vcl_recv {
 
 
 
+
+
   # Force SSL.
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";

diff --git a/spec/test-outputs/www-staging.out.vcl b/spec/test-outputs/www-staging.out.vcl
@@ -159,6 +159,15 @@ sub vcl_recv {
 
 
 
+
+  # Strip Accept-Encoding header if the content is already compressed
+  if (req.http.Accept-Encoding) {
+    if (req.url ~ "\.(jpeg|jpg|png|gif|gz|tgz|bz2|tbz|zip|flv|pdf|mp3|ogg)$") {
+      remove req.http.Accept-Encoding;
+    }
+  }
+
+
   # Force SSL.
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";

diff --git a/spec/test-outputs/www-test.out.vcl b/spec/test-outputs/www-test.out.vcl
@@ -55,6 +55,15 @@ sub vcl_recv {
 
 
 
+
+  # Strip Accept-Encoding header if the content is already compressed
+  if (req.http.Accept-Encoding) {
+    if (req.url ~ "\.(jpeg|jpg|png|gif|gz|tgz|bz2|tbz|zip|flv|pdf|mp3|ogg)$") {
+      remove req.http.Accept-Encoding;
+    }
+  }
+
+
   # Force SSL.
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";

diff --git a/vcl_templates/www.vcl.erb b/vcl_templates/www.vcl.erb
@@ -204,6 +204,15 @@ sub vcl_recv {
   }
   <% end %>
 
+  <% if environment != 'production' %>
+  # Strip Accept-Encoding header if the content is already compressed
+  if (req.http.Accept-Encoding) {
+    if (req.url ~ "\.(jpeg|jpg|png|gif|gz|tgz|bz2|tbz|zip|flv|pdf|mp3|ogg)$") {
+      remove req.http.Accept-Encoding;
+    }
+  }
+  <% end %>
+
   # Force SSL.
   if (!req.http.Fastly-SSL) {
      error 801 "Force SSL";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -151,6 +151,8 @@ sub vcl_recv {





		# Force SSL.
		if (!req.http.Fastly-SSL) {
		error 801 "Force SSL";
Expand Down