projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/activitypub
[akkoma]
/
lib
/
pleroma
/
http
/
http.ex
diff --git
a/lib/pleroma/http/http.ex
b/lib/pleroma/http/http.ex
index 31135411c0953fb6f1a050f06d17b340d8d57426..8b8a82353a9c4c2e5e88960c769b64ea5e11bb59 100644
(file)
--- a/
lib/pleroma/http/http.ex
+++ b/
lib/pleroma/http/http.ex
@@
-4,9
+4,9
@@
defmodule Pleroma.HTTP do
def process_request_options(options) do
config = Application.get_env(:pleroma, :http, [])
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
case proxy do
-
""
-> options
+
nil
-> options
_ -> options ++ [proxy: proxy]
end
end
_ -> options ++ [proxy: proxy]
end
end