diff options
| author | feld <feld@feld.me> | 2020-09-18 18:38:20 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-09-18 18:38:20 +0000 |
| commit | 6c052bd5b6cc29d321b500654bd6b098d0e6c56a (patch) | |
| tree | 9357c0e0f653f8e35d63e32eb0faf090e600a816 /lib/pleroma/reverse_proxy | |
| parent | 91ddd47e513c5fc343ffa9bea069801b0142a115 (diff) | |
| parent | a42880040574701000470fc1c2dbd6f7242c1a06 (diff) | |
| download | pleroma-6c052bd5b6cc29d321b500654bd6b098d0e6c56a.tar.gz pleroma-6c052bd5b6cc29d321b500654bd6b098d0e6c56a.zip | |
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
Diffstat (limited to 'lib/pleroma/reverse_proxy')
| -rw-r--r-- | lib/pleroma/reverse_proxy/reverse_proxy.ex | 5 |
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 |