From 4233b1504fb4ac81c9700fc71a806407452c6c54 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Mon, 7 May 2018 23:43:27 +0000 Subject: [PATCH 1/2] Caching notice URLs does not produce pleasant results --- installation/pleroma.vcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl index f3faa9432..9f783b5da 100644 --- a/installation/pleroma.vcl +++ b/installation/pleroma.vcl @@ -41,7 +41,7 @@ sub vcl_recv { # Strip headers that will affect caching from all other static content # This also permits caching of individual toots and AP Activities - if ((req.url ~ "^/(media|notice|static)/") || + if ((req.url ~ "^/(media|static)/") || (req.url ~ "(?i)\.(html|js|css|jpg|jpeg|png|gif|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|ttf|pdf|woff|woff2)$")) { unset req.http.Cookie; From a85d05167580035608909db241dd8f5756c351b9 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Mon, 7 May 2018 23:44:40 +0000 Subject: [PATCH 2/2] Don't strip headers from backend for /notice/ either --- installation/pleroma.vcl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl index 9f783b5da..63c1cb74d 100644 --- a/installation/pleroma.vcl +++ b/installation/pleroma.vcl @@ -93,8 +93,7 @@ sub vcl_backend_response { # Strip cache-restricting headers from Pleroma on static content that we want to cache # Also enable streaming of cached content to clients (no waiting for Varnish to complete backend fetch) - if ((bereq.url ~ "^/(notice)/") || - (bereq.url ~ "(?i)\.(js|css|jpg|jpeg|png|gif|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|ttf|pdf|woff|woff2)$")) + if (bereq.url ~ "(?i)\.(js|css|jpg|jpeg|png|gif|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|ttf|pdf|woff|woff2)$") { unset beresp.http.set-cookie; unset beresp.http.Cache-Control;