From 50ba4ba2c9ebe522f5981d19e51f7ae41a02e7d8 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 7 Mar 2019 23:31:59 +0000 Subject: [PATCH] http: connection: merge hackney option lists instead of concatenating them this ensures the right pools are used --- lib/pleroma/http/connection.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex index b798eaa5a..cc2e96e2b 100644 --- a/lib/pleroma/http/connection.ex +++ b/lib/pleroma/http/connection.ex @@ -31,6 +31,6 @@ def new(opts \\ []) do # defp hackney_options(opts) do options = Keyword.get(opts, :adapter, []) - @hackney_options ++ options + Keyword.merge(@hackney_options, options) end end