pleroma

commit: 6ff583e5e10e59fe76cb51ce3d04587307af9eae
parent: fcc941adfd6741fd645ca3d232e24f1c68c3d65d
Author: lambda <pleromagit@rogerbraun.net>
Date:   Tue, 10 Apr 2018 14:45:46 +0000

Merge branch 'feld-varnish' into 'develop'

Remove attempted caching of toots

See merge request pleroma/pleroma!106
Diffstat:
M
installation/pleroma.vcl
4
----

1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/installation/pleroma.vcl b/installation/pleroma.vcl
@@ -48,8 +48,6 @@ 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|objects|static)/") ||
-    (req.url ~ "^/(activities/|api/v1/statuses/\d+$)") ||
-    (req.url ~ "^/(activities/|api/v1/statuses/\d+/card$)") ||
     (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;
@@ -102,8 +100,6 @@ 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|objects)/") ||
-    (bereq.url ~ "^/(activities/|api/v1/statuses/\d+$)") ||
-    (bereq.url ~ "^/(activities/|api/v1/statuses/\d+/card$)") ||
     (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;