X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fhttp.ex;h=84f34eb4a73533ca1376762a14da56c608ffdd1d;hb=0ec1abb3b65d9885e81a470efcc5b7437c4f8d4c;hp=8b8a82353a9c4c2e5e88960c769b64ea5e11bb59;hpb=5e37adedfb718264fbc3eb3353ccee5244e82a89;p=akkoma diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex index 8b8a82353..84f34eb4a 100644 --- a/lib/pleroma/http/http.ex +++ b/lib/pleroma/http/http.ex @@ -1,14 +1,13 @@ - defmodule Pleroma.HTTP do use HTTPoison.Base 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 end - end