projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
[akkoma]
/
lib
/
pleroma
/
reverse_proxy
/
reverse_proxy.ex
diff --git
a/lib/pleroma/reverse_proxy/reverse_proxy.ex
b/lib/pleroma/reverse_proxy/reverse_proxy.ex
index 28ad4c8460a92a7690b55ac3c92db6b66df6bff3..613edf5658933c33688ac3c81b703f2f805245b3 100644
(file)
--- a/
lib/pleroma/reverse_proxy/reverse_proxy.ex
+++ b/
lib/pleroma/reverse_proxy/reverse_proxy.ex
@@
-17,6
+17,8
@@
defmodule Pleroma.ReverseProxy do
@failed_request_ttl :timer.seconds(60)
@methods ~w(GET HEAD)
@failed_request_ttl :timer.seconds(60)
@methods ~w(GET HEAD)
+ def max_read_duration_default, do: @max_read_duration
+
@moduledoc """
A reverse proxy.
@moduledoc """
A reverse proxy.
@@
-388,6
+390,8
@@
defmodule Pleroma.ReverseProxy do
defp body_size_constraint(_, _), do: :ok
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
defp check_read_duration(duration, max)
when is_integer(duration) and is_integer(max) and max > 0 do
if duration > max do