From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Mon, 16 Mar 2020 11:25:55 +0000 (+0300)
Subject: Merge branch 'develop' into gun
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f0651730bdf018b713e21ce718719c7781398362;p=akkoma

Merge branch 'develop' into gun
---

f0651730bdf018b713e21ce718719c7781398362
diff --cc config/test.exs
index bce9dd4aa,b8ea63c94..040e67e4a
--- a/config/test.exs
+++ b/config/test.exs
@@@ -90,10 -90,10 +90,12 @@@ config :pleroma, Pleroma.ReverseProxy.C
  
  config :pleroma, :modules, runtime_dir: "test/fixtures/modules"
  
 +config :pleroma, Pleroma.Gun, Pleroma.GunMock
 +
  config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true
  
+ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+ 
  if File.exists?("./config/test.secret.exs") do
    import_config "test.secret.exs"
  else
diff --cc lib/pleroma/reverse_proxy/reverse_proxy.ex
index 35b973b56,8b713b8f4..4bbeb493c
--- a/lib/pleroma/reverse_proxy/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy/reverse_proxy.ex
@@@ -3,9 -3,11 +3,9 @@@
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.ReverseProxy do
 -  alias Pleroma.HTTP
 -
    @keep_req_headers ~w(accept user-agent accept-encoding cache-control if-modified-since) ++
                        ~w(if-unmodified-since if-none-match if-range range)
-   @resp_cache_headers ~w(etag date last-modified cache-control)
+   @resp_cache_headers ~w(etag date last-modified)
    @keep_resp_headers @resp_cache_headers ++
                         ~w(content-type content-disposition content-encoding content-range) ++
                         ~w(accept-ranges vary)