Merge branch 'respect-proxy-settings-federation' into 'develop'

Respect proxy settings federation

See merge request pleroma/pleroma!1206
This commit is contained in:
kaniini 2019-05-28 06:49:54 +00:00
commit b949a37ef5

View file

@ -32,9 +32,11 @@ defmodule Pleroma.HTTP.Connection do
defp hackney_options(opts) do
options = Keyword.get(opts, :adapter, [])
adapter_options = Pleroma.Config.get([:http, :adapter], [])
proxy_url = Pleroma.Config.get([:http, :proxy_url], nil)
@hackney_options
|> Keyword.merge(adapter_options)
|> Keyword.merge(options)
|> Keyword.merge(proxy: proxy_url)
end
end