logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 94ac0075bf4cd968e45f8d848263f9824ce79acc
parent: 94d8f1ab305b513931b81d7a4b3e41e30b688a16
Author: lambda <pleromagit@rogerbraun.net>
Date:   Fri,  7 Dec 2018 18:48:26 +0000

Merge branch 'media-proxy-follow-redirect' into 'develop'

Media proxy: follow HTTP redirects by default

Closes #421

See merge request pleroma/pleroma!519

Diffstat:

Mlib/pleroma/web/media_proxy/controller.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex @@ -2,7 +2,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do use Pleroma.Web, :controller alias Pleroma.{Web.MediaProxy, ReverseProxy} - @default_proxy_opts [max_body_length: 25 * 1_048_576] + @default_proxy_opts [max_body_length: 25 * 1_048_576, http: [follow_redirect: true]] def remote(conn, params = %{"sig" => sig64, "url" => url64}) do with config <- Pleroma.Config.get([:media_proxy], []),