Merge pull request #30 from alphagov/remove-deprecated-header

Remove deprecated use of Fastly-Cachetype header
alphagov · Dec 4, 2023 · 9ca6982 · 9ca6982
2 parents bfea866 + d3e8419
commit 9ca6982
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/modules/assets/assets.vcl.tftpl b/modules/assets/assets.vcl.tftpl
@@ -275,7 +275,6 @@ sub vcl_fetch {
   }
 
   if (beresp.http.Cache-Control ~ "private") {
-    set req.http.Fastly-Cachetype = "PRIVATE";
     return (pass);
   }
 
@@ -288,7 +287,6 @@ sub vcl_fetch {
   }
 
   if (beresp.status >= 500 && beresp.status <= 599) {
-    set req.http.Fastly-Cachetype = "ERROR";
     set beresp.ttl = 1s;
     set beresp.grace = 5s;
     if (beresp.http.Fastly-Backend-Name ~ "mirrorS3") {

diff --git a/modules/bouncer/bouncer.vcl.tftpl b/modules/bouncer/bouncer.vcl.tftpl
@@ -85,17 +85,14 @@ sub vcl_fetch {
   }
 
   if (beresp.http.Set-Cookie) {
-    set req.http.Fastly-Cachetype = "SETCOOKIE";
     return (pass);
   }
 
   if (beresp.http.Cache-Control ~ "private") {
-    set req.http.Fastly-Cachetype = "PRIVATE";
     return (pass);
   }
 
   if (beresp.status == 500 || beresp.status == 503) {
-    set req.http.Fastly-Cachetype = "ERROR";
     set beresp.ttl = 1s;
     set beresp.grace = 5s;
     return (deliver);

diff --git a/modules/www/www.vcl.tftpl b/modules/www/www.vcl.tftpl
@@ -387,7 +387,6 @@ sub vcl_fetch {
   }
 
   if (beresp.status >= 500 && beresp.status <= 599) {
-    set req.http.Fastly-Cachetype = "ERROR";
     set beresp.ttl = 1s;
     set beresp.grace = 5s;
     if (beresp.http.Fastly-Backend-Name ~ "^mirror") {
@@ -397,7 +396,6 @@ sub vcl_fetch {
   }
 
   if (beresp.http.Cache-Control ~ "private") {
-    set req.http.Fastly-Cachetype = "PRIVATE";
     return (pass);
   }