alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Media proxy: follow HTTP redirects by default

Closes #421

See merge request pleroma/pleroma!519
This commit is contained in:
lambda 2018-12-07 18:48:26 +00:00
parent 94d8f1ab30 d8fcf7c5cf
commit 94ac0075bf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/media_proxy/controller.ex
View File

@ -2,7 +2,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
alias Pleroma.{Web.MediaProxy, ReverseProxy} 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 def remote(conn, params = %{"sig" => sig64, "url" => url64}) do
with config <- Pleroma.Config.get([:media_proxy], []), with config <- Pleroma.Config.get([:media_proxy], []),