diff options
| author | feld <feld@feld.me> | 2024-07-24 20:58:31 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-07-24 20:58:31 +0000 |
| commit | 700c1066801ba1400a32c819fb0e608aa834aa51 (patch) | |
| tree | d3b034ccdde9bb3b03738380e5c1ccd49e3c0450 /config/description.exs | |
| parent | f32a837afa694999426d644d00ddbe0c521d0bb3 (diff) | |
| parent | 659891921371fd3a8788089fbc96a9158f07f289 (diff) | |
| download | pleroma-700c1066801ba1400a32c819fb0e608aa834aa51.tar.gz pleroma-700c1066801ba1400a32c819fb0e608aa834aa51.zip | |
Merge branch 'oban/rich-media-hardening' into 'develop'
Harden Rich Media parsing against very slow or malicious URLs
See merge request pleroma/pleroma!4192
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/description.exs b/config/description.exs index b7d86dc63..10a6e9cdf 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2101,11 +2101,11 @@ config :pleroma, :config_description, [ ] }, %{ - key: :failure_backoff, + key: :timeout, type: :integer, description: - "Amount of milliseconds after request failure, during which the request will not be retried.", - suggestions: [60_000] + "Amount of milliseconds after which the HTTP request is forcibly terminated.", + suggestions: [5_000] } ] }, |