aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKokaKiwi <kokakiwi@kokakiwi.net>2019-03-03 18:33:02 +0100
committerKokaKiwi <kokakiwi@kokakiwi.net>2019-03-04 11:30:26 +0100
commitb57913b13ad07cfaa345f7d1e964cd37e5545aa5 (patch)
tree5924877ad7226dc0e82cdf50d8e346bfb38fcc4f /lib
parentdd5865535eb16f535ff996eb3dec5e947a905268 (diff)
downloadpleroma-b57913b13ad07cfaa345f7d1e964cd37e5545aa5.tar.gz
Fix supported TLS versions as TLS 1.3 support seems buggy.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/http/http.ex7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index 75c58e6c9..26214ef3f 100644
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -30,6 +30,7 @@ defmodule Pleroma.HTTP do
options =
process_request_options(options)
|> process_sni_options(url)
+ |> process_adapter_options()
params = Keyword.get(options, :params, [])
@@ -56,6 +57,12 @@ defmodule Pleroma.HTTP do
end
end
+ def process_adapter_options(options) do
+ adapter_options = Pleroma.Config.get([:http, :adapter], [])
+
+ options ++ [adapter: adapter_options]
+ end
+
def process_request_options(options) do
config = Application.get_env(:pleroma, :http, [])
proxy = Keyword.get(config, :proxy_url, nil)