diff options
| author | Jeff Becker <jeff@i2p.rocks> | 2017-12-31 09:25:00 -0500 |
|---|---|---|
| committer | Jeff Becker <jeff@i2p.rocks> | 2017-12-31 09:25:00 -0500 |
| commit | 1e185b9301ec85cd2aaeb1faf075aaa86f733373 (patch) | |
| tree | 18cc342396a78f0ee0e9c016779cb2d33f7a5ab4 | |
| parent | 39854d6c11c11767ff568c6020b0506a9cdde4e4 (diff) | |
| download | pleroma-1e185b9301ec85cd2aaeb1faf075aaa86f733373.tar.gz | |
apply proxy settings to media_proxy
| -rw-r--r-- | lib/pleroma/web/media_proxy/controller.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/media_proxy/controller.ex b/lib/pleroma/web/media_proxy/controller.ex index 560a65353..9327e7253 100644 --- a/lib/pleroma/web/media_proxy/controller.ex +++ b/lib/pleroma/web/media_proxy/controller.ex @@ -2,6 +2,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do use Pleroma.Web, :controller require Logger + @httpoison Application.get_env(:pleroma, :httpoison) + @max_body_length 25 * 1048576 @cache_control %{ @@ -29,7 +31,7 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do defp proxy_request(link) do headers = [{"user-agent", "Pleroma/MediaProxy; #{Pleroma.Web.base_url()} <#{Application.get_env(:pleroma, :instance)[:email]}>"}] - options = [:insecure, {:follow_redirect, true}] + options = @httpoison.process_request_options([:insecure, {:follow_redirect, true}]) with \ {:ok, 200, headers, client} <- :hackney.request(:get, link, headers, "", options), headers = Enum.into(headers, Map.new), |