aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-03-13 22:12:33 +0300
committerrinpatch <rinpatch@sdf.org>2020-03-13 22:12:33 +0300
commit6a28c198af415c81596587f765e6c8c9388e9714 (patch)
tree86b5be2646fc356837821ae585cd3aa7679a6084
parentc6eb1c1b929b85d14bf4ba29616c5b4bad732001 (diff)
downloadpleroma-6a28c198af415c81596587f765e6c8c9388e9714.tar.gz
uploaded media plug: do not inject compile-time params on every request
-rw-r--r--lib/pleroma/plugs/uploaded_media.ex9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/pleroma/plugs/uploaded_media.ex b/lib/pleroma/plugs/uploaded_media.ex
index 74427709d..36ff024a7 100644
--- a/lib/pleroma/plugs/uploaded_media.ex
+++ b/lib/pleroma/plugs/uploaded_media.ex
@@ -18,7 +18,10 @@ defmodule Pleroma.Plugs.UploadedMedia do
def init(_opts) do
static_plug_opts =
- []
+ [
+ headers: %{"cache-control" => @default_cache_control_header},
+ cache_control_for_etags: @default_cache_control_header
+ ]
|> Keyword.put(:from, "__unconfigured_media_plug")
|> Keyword.put(:at, "/__unconfigured_media_plug")
|> Plug.Static.init()
@@ -60,10 +63,6 @@ defmodule Pleroma.Plugs.UploadedMedia do
Map.get(opts, :static_plug_opts)
|> Map.put(:at, [@path])
|> Map.put(:from, directory)
- |> Map.put(:cache_control_for_etags, @default_cache_control_header)
- |> Map.put(:headers, %{
- "cache-control" => @default_cache_control_header
- })
conn = Plug.Static.call(conn, static_opts)