fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 15:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

http: connection: merge hackney option lists instead of concatenating them

Browse source 
this ensures the right pools are used
This commit is contained in:
William Pitcock 2019-03-07 23:31:59 +00:00
parent 2a83c0ba93
commit 50ba4ba2c9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/http/connection.ex
View file

@ -31,6 +31,6 @@ 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, [])
@hackney_options ++ options Keyword.merge(@hackney_options, options)
end end
end end