diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-07 18:48:26 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-07 18:48:26 +0000 |
| commit | 94ac0075bf4cd968e45f8d848263f9824ce79acc (patch) | |
| tree | 60a47d421b719a82e2086473e95a4f5b907918c3 /lib | |
| parent | 94d8f1ab305b513931b81d7a4b3e41e30b688a16 (diff) | |
| parent | d8fcf7c5cfc63cbdf823248bb259e7e6a25fd333 (diff) | |
| download | pleroma-94ac0075bf4cd968e45f8d848263f9824ce79acc.tar.gz | |
Merge branch 'media-proxy-follow-redirect' into 'develop'
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/media_proxy/controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
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], []), |