From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 7 Mar 2019 23:31:59 +0000 (+0000)
Subject: http: connection: merge hackney option lists instead of concatenating them
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=50ba4ba2c9ebe522f5981d19e51f7ae41a02e7d8;p=akkoma

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

this ensures the right pools are used
---

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 @@ 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