Merge branch 'feld-varnish' into 'develop'
Remove attempted caching of toots See merge request pleroma/pleroma!106
This commit is contained in:
commit
6ff583e5e1
|
@ -48,8 +48,6 @@ sub vcl_recv {
|
||||||
# Strip headers that will affect caching from all other static content
|
# Strip headers that will affect caching from all other static content
|
||||||
# This also permits caching of individual toots and AP Activities
|
# This also permits caching of individual toots and AP Activities
|
||||||
if ((req.url ~ "^/(media|notice|objects|static)/") ||
|
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)$"))
|
(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;
|
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
|
# 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)
|
# Also enable streaming of cached content to clients (no waiting for Varnish to complete backend fetch)
|
||||||
if ((bereq.url ~ "^/(notice|objects)/") ||
|
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)$"))
|
(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.set-cookie;
|
||||||
|
|
Loading…
Reference in New Issue