summaryrefslogtreecommitdiff
path: root/lib/pleroma/reverse_proxy
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2020-09-20 19:27:27 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2020-09-20 19:27:27 +0300
commit4987ee6256c4227793240c74043845a661e3d37b (patch)
tree40abf0e0c85df9788b59f24ed4026ae00a89e5e5 /lib/pleroma/reverse_proxy
parent44e8b6037ae71881327451dcf7d9351f1ba82674 (diff)
parent882c1fc6bdff4e27955730a412d73ead0e67a741 (diff)
downloadpleroma-4987ee6256c4227793240c74043845a661e3d37b.tar.gz
pleroma-4987ee6256c4227793240c74043845a661e3d37b.zip
Merge branch 'develop' into feature/expire-mutes
Diffstat (limited to 'lib/pleroma/reverse_proxy')
-rw-r--r--lib/pleroma/reverse_proxy/reverse_proxy.ex5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/reverse_proxy/reverse_proxy.ex b/lib/pleroma/reverse_proxy/reverse_proxy.ex
index 0de4e2309..8ae1157df 100644
--- a/lib/pleroma/reverse_proxy/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy/reverse_proxy.ex
@@ -17,6 +17,9 @@ defmodule Pleroma.ReverseProxy do
@failed_request_ttl :timer.seconds(60)
@methods ~w(GET HEAD)
+ def max_read_duration_default, do: @max_read_duration
+ def default_cache_control_header, do: @default_cache_control_header
+
@moduledoc """
A reverse proxy.
@@ -391,6 +394,8 @@ defmodule Pleroma.ReverseProxy do
defp body_size_constraint(_, _), do: :ok
+ defp check_read_duration(nil = _duration, max), do: check_read_duration(@max_read_duration, max)
+
defp check_read_duration(duration, max)
when is_integer(duration) and is_integer(max) and max > 0 do
if duration > max do