projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'
[akkoma]
/
lib
/
pleroma
/
http
/
http.ex
diff --git
a/lib/pleroma/http/http.ex
b/lib/pleroma/http/http.ex
index c96ee7353db19225f367d7afb900efcb8b9629f2..dec24458a82b0a8c04f094aa7553a4dd54cf9e2b 100644
(file)
--- 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
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 """
end
@doc """