logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 096c5c52e0eda931e3a9c46b61292dde55e19c91
parent: 802b991814fb851c0442dbb7b7bfc065fc062178
Author: rinpatch <rinpatch@sdf.org>
Date:   Fri, 13 Mar 2020 16:25:10 +0000

Merge branch 'revert/cache-control' into 'develop'

Revert "Set better Cache-Control header for static content"

Closes #1613

See merge request pleroma/pleroma!2290

Diffstat:

Mlib/pleroma/web/endpoint.ex2+-
Mtest/plugs/cache_control_test.exs2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex @@ -12,7 +12,7 @@ defmodule Pleroma.Web.Endpoint do plug(Pleroma.Plugs.HTTPSecurityPlug) plug(Pleroma.Plugs.UploadedMedia) - @static_cache_control "public max-age=86400 must-revalidate" + @static_cache_control "public, no-cache" # InstanceStatic needs to be before Plug.Static to be able to override shipped-static files # If you're adding new paths to `only:` you'll need to configure them in InstanceStatic as well diff --git a/test/plugs/cache_control_test.exs b/test/plugs/cache_control_test.exs @@ -9,7 +9,7 @@ defmodule Pleroma.Web.CacheControlTest do test "Verify Cache-Control header on static assets", %{conn: conn} do conn = get(conn, "/index.html") - assert Conn.get_resp_header(conn, "cache-control") == ["public max-age=86400 must-revalidate"] + assert Conn.get_resp_header(conn, "cache-control") == ["public, no-cache"] end test "Verify Cache-Control header on the API", %{conn: conn} do