diff options
| author | lain <lain@soykaf.club> | 2021-01-07 16:25:39 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-07 16:25:39 +0000 |
| commit | ac1298fce817e10cb357162441c77d860c4c757d (patch) | |
| tree | 2575b88d1def1761423a340d18006eac95bf0363 /lib | |
| parent | cf0eb0c1c5c945c660295f51c99fe157b2b8229c (diff) | |
| parent | d69c78ceb969c8bef50743d03308d145f0b08a75 (diff) | |
| download | pleroma-ac1298fce817e10cb357162441c77d860c4c757d.tar.gz | |
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/plugs/uploaded_media.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/plugs/uploaded_media.ex b/lib/pleroma/web/plugs/uploaded_media.ex index 402a8bb34..94b4c2177 100644 --- a/lib/pleroma/web/plugs/uploaded_media.ex +++ b/lib/pleroma/web/plugs/uploaded_media.ex @@ -87,8 +87,15 @@ defmodule Pleroma.Web.Plugs.UploadedMedia do end defp get_media(conn, {:url, url}, true, _) do + proxy_opts = [ + http: [ + follow_redirect: true, + pool: :upload + ] + ] + conn - |> Pleroma.ReverseProxy.call(url, Pleroma.Config.get([Pleroma.Upload, :proxy_opts], [])) + |> Pleroma.ReverseProxy.call(url, proxy_opts) end defp get_media(conn, {:url, url}, _, _) do |