X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fhttp.ex;h=84f34eb4a73533ca1376762a14da56c608ffdd1d;hb=40af4525940e8bdf09520c2320ae93d6c945bee2;hp=31135411c0953fb6f1a050f06d17b340d8d57426;hpb=dffde6631d105949b62c1ff27c22fefcb873b2e8;p=akkoma diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex index 31135411c..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, "") + proxy = Keyword.get(config, :proxy_url, nil) + case proxy do - "" -> options + nil -> options _ -> options ++ [proxy: proxy] end end - end