diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2025-01-21 09:31:17 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2025-01-21 09:31:17 +0000 |
| commit | 4461cc984dfc895870c23d3fbe5f0f41a587f812 (patch) | |
| tree | 0d8f553e4801dffded680ebb20f6d0f4d0002ae8 /lib | |
| parent | 1bebc900ed836fcdb3d651a8d09476ac0f9e349e (diff) | |
| parent | 22261718907d227a521bb9f898e617ea137c502d (diff) | |
| download | pleroma-4461cc984dfc895870c23d3fbe5f0f41a587f812.tar.gz pleroma-4461cc984dfc895870c23d3fbe5f0f41a587f812.zip | |
Merge branch 'proxy-redirect' into 'develop'
MediaProxyController: Use 301 for permanent redirects
See merge request pleroma/pleroma!4313
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy_controller.ex | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy_controller.ex b/lib/pleroma/web/media_proxy/media_proxy_controller.ex index 0b446e0a6..a0aafc32e 100644 --- a/lib/pleroma/web/media_proxy/media_proxy_controller.ex +++ b/lib/pleroma/web/media_proxy/media_proxy_controller.ex @@ -71,11 +71,15 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do drop_static_param_and_redirect(conn) content_type == "image/gif" -> - redirect(conn, external: media_proxy_url) + conn + |> put_status(301) + |> redirect(external: media_proxy_url) min_content_length_for_preview() > 0 and content_length > 0 and content_length < min_content_length_for_preview() -> - redirect(conn, external: media_proxy_url) + conn + |> put_status(301) + |> redirect(external: media_proxy_url) true -> handle_preview(content_type, conn, media_proxy_url) |