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 /docs/configuration | |
| 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 'docs/configuration')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 9c5659988..ab0d1c78d 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -436,7 +436,7 @@ config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http, * `ignore_hosts`: list of hosts which will be ignored by the metadata parser. For example `["accounts.google.com", "xss.website"]`, defaults to `[]`. * `ignore_tld`: list TLDs (top-level domains) which will ignore for parse metadata. default is ["local", "localdomain", "lan"]. * `parsers`: list of Rich Media parsers. -* `failure_backoff`: Amount of milliseconds after request failure, during which the request will not be retried. +* `timeout`: Amount of milliseconds after which the HTTP request is forcibly terminated. ## HTTP server |