diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-04-17 05:47:54 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-04-17 05:47:54 +0000 |
| commit | 71a03732327409fca07c83da35e372307223f515 (patch) | |
| tree | ec9538404e47c6e4e86105885cd9585bf85d56c0 /changelog.d | |
| parent | d80e0d6873a61159a68b337d7f42f46cbdad8e9d (diff) | |
| parent | 741f22bfe0129cdec07adb954856f3018db79c97 (diff) | |
| download | pleroma-71a03732327409fca07c83da35e372307223f515.tar.gz pleroma-71a03732327409fca07c83da35e372307223f515.zip | |
Merge branch 'ffmpeg-limiter' into 'develop'
Prevent Media Helper from respawning ffmpeg for bad media
See merge request pleroma/pleroma!4086
Diffstat (limited to 'changelog.d')
| -rw-r--r-- | changelog.d/ffmpeg-limiter.add | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/ffmpeg-limiter.add b/changelog.d/ffmpeg-limiter.add new file mode 100644 index 000000000..e4a5ef196 --- /dev/null +++ b/changelog.d/ffmpeg-limiter.add @@ -0,0 +1 @@ +Framegrabs with ffmpeg will execute with a 5 second timeout and cache the URLs of failures with a TTL of 15 minutes to prevent excessive retries. |