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

this ensures the right pools are used
2019-03-07 23:31:59 +00:00 · 2019-03-07 23:31:59 +00:00 · 50ba4ba2c9
parent 2a83c0ba93
commit 50ba4ba2c9
1 changed files with 1 additions and 1 deletions
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@ -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