X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fhttp.ex;h=ee5b5e127a09dec311971635c73f4b01d7b585c9;hb=5b74976c8d8b00b66ba8c5dff9e83fbe357b0ee7;hp=c5f720bc9f756292f0c99d2c44500911ca19062f;hpb=4e72762322a5616ce426df62888ee3bc7af19dc8;p=akkoma
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index c5f720bc9..ee5b5e127 100644
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTTP do
@@ -65,13 +65,7 @@ defmodule Pleroma.HTTP do
end
def process_request_options(options) do
- config = Application.get_env(:pleroma, :http, [])
- proxy = Keyword.get(config, :proxy_url, nil)
-
- case proxy do
- nil -> options
- _ -> options ++ [proxy: proxy]
- end
+ Keyword.merge(Pleroma.HTTP.Connection.hackney_options([]), options)
end
@doc """