Respect proxy settings federation
This commit is contained in:
parent
5bb843ceec
commit
9f3bcf0efe
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user