Merge branch 'proxy-no-default-plug-cache' into 'develop'

Always override plug's default cache-control in reverse proxy

See merge request pleroma/pleroma!692

lib/pleroma/reverse_proxy.ex

@@ -275,11 +275,24 @@ defp build_resp_headers(headers, opts) do
 
   defp build_resp_cache_headers(headers, _opts) do
     has_cache? = Enum.any?(headers, fn {k, _} -> k in @resp_cache_headers end)
+    has_cache_control? = List.keymember?(headers, "cache-control", 0)
 
-    if has_cache? do
+    cond do
-      headers
+      has_cache? && has_cache_control? ->
-    else
+        headers
-      List.keystore(headers, "cache-control", 0, {"cache-control", @default_cache_control_header})
+
+      has_cache? ->
+        # There's caching header present but no cache-control -- we need to explicitely override it to public
+        # as Plug defaults to "max-age=0, private, must-revalidate"
+        List.keystore(headers, "cache-control", 0, {"cache-control", "public"})
+
+      true ->
+        List.keystore(
+          headers,
+          "cache-control",
+          0,
+          {"cache-control", @default_cache_control_header}
+        )
     end
   end