hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

little polishing

Browse source
This commit is contained in:
Alexander Strizhakov 2020-03-06 21:24:19 +03:00
commit 78282dc983
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
4 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/http/adapter_helper/hackney.ex
View file

@ -13,8 +13,10 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do
def options(connection_opts \\ [], %URI{} = uri) do
proxy = Pleroma.Config.get([:http, :proxy_url], nil)
config_opts = Pleroma.Config.get([:http, :adapter], [])
@defaults
|> Keyword.merge(Pleroma.Config.get([:http, :adapter], []))
|> Keyword.merge(config_opts)
|> Keyword.merge(connection_opts)
|> add_scheme_opts(uri)
|> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)