mirror of
https://git.pleroma.social/sjw/pleroma.git
synced 2024-12-25 06:35:12 +01:00
Merge branch 'respect-proxy-settings-federation' into 'develop'
Respect proxy settings federation See merge request pleroma/pleroma!1206
This commit is contained in:
commit
b949a37ef5
@ -32,9 +32,11 @@ defmodule Pleroma.HTTP.Connection do
|
|||||||
defp hackney_options(opts) do
|
defp hackney_options(opts) do
|
||||||
options = Keyword.get(opts, :adapter, [])
|
options = Keyword.get(opts, :adapter, [])
|
||||||
adapter_options = Pleroma.Config.get([:http, :adapter], [])
|
adapter_options = Pleroma.Config.get([:http, :adapter], [])
|
||||||
|
proxy_url = Pleroma.Config.get([:http, :proxy_url], nil)
|
||||||
|
|
||||||
@hackney_options
|
@hackney_options
|
||||||
|> Keyword.merge(adapter_options)
|
|> Keyword.merge(adapter_options)
|
||||||
|> Keyword.merge(options)
|
|> Keyword.merge(options)
|
||||||
|
|> Keyword.merge(proxy: proxy_url)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user