http: connection: merge hackney option lists instead of concatenating them
this ensures the right pools are used
This commit is contained in:
parent
2a83c0ba93
commit
50ba4ba2c9
1 changed files with 1 additions and 1 deletions
|
@ -31,6 +31,6 @@ defmodule Pleroma.HTTP.Connection do
|
|||
#
|
||||
defp hackney_options(opts) do
|
||||
options = Keyword.get(opts, :adapter, [])
|
||||
@hackney_options ++ options
|
||||
Keyword.merge(@hackney_options, options)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue