diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2019-03-07 23:31:59 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2019-03-08 22:56:16 +0000 |
| commit | 50ba4ba2c9ebe522f5981d19e51f7ae41a02e7d8 (patch) | |
| tree | b1f6977be084757aefdf4ef7e036e775d2f134a1 /lib | |
| parent | 2a83c0ba935355b4ada582315de68b456e727af7 (diff) | |
| download | pleroma-50ba4ba2c9ebe522f5981d19e51f7ae41a02e7d8.tar.gz | |
http: connection: merge hackney option lists instead of concatenating them
this ensures the right pools are used
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/http/connection.ex | 2 |
1 files changed, 1 insertions, 1 deletions
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 |