summaryrefslogtreecommitdiff
path: root/lib/pleroma/http/http.ex
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/http/http.ex')
-rw-r--r--lib/pleroma/http/http.ex5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index c96ee7353..dec24458a 100644
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -65,10 +65,7 @@ defmodule Pleroma.HTTP do
end
def process_request_options(options) do
- case Pleroma.Config.get([:http, :proxy_url]) do
- nil -> options
- proxy -> options ++ [proxy: proxy]
- end
+ Keyword.merge(Pleroma.HTTP.Connection.hackney_options([]), options)
end
@doc """