Commit 94ac0075 authored by lain's avatar lain
Browse files

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

Media proxy: follow HTTP redirects by default

Closes #421

See merge request pleroma/pleroma!519
parents 94d8f1ab d8fcf7c5
Pipeline #5099 canceled with stages
......@@ -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], []),
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment