From: href <href@random.sh>
Date: Fri, 7 Dec 2018 18:36:44 +0000 (+0100)
Subject: Media proxy: follow HTTP redirects by default
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=d8fcf7c5cfc63cbdf823248bb259e7e6a25fd333;p=akkoma

Media proxy: follow HTTP redirects by default
---

diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex
index e1b87e026..d0b92d0c1 100644
--- 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], []),