diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-17 08:41:35 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-17 08:41:35 +0300 |
| commit | b867f9d7aebc4e5b8832228a54f928b9f92dad0e (patch) | |
| tree | ee00341390c7e3382092a8f4191485f15067f943 /lib/pleroma/reverse_proxy | |
| parent | 917d325972e3aeb367583c61aaa109d62fcba837 (diff) | |
| parent | c5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b (diff) | |
| download | pleroma-b867f9d7aebc4e5b8832228a54f928b9f92dad0e.tar.gz pleroma-b867f9d7aebc4e5b8832228a54f928b9f92dad0e.zip | |
Merge branch 'develop' into issue/2099
Diffstat (limited to 'lib/pleroma/reverse_proxy')
| -rw-r--r-- | lib/pleroma/reverse_proxy/client/hackney.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/reverse_proxy/client/tesla.ex | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/reverse_proxy/client/hackney.ex b/lib/pleroma/reverse_proxy/client/hackney.ex index e84118a90..ad988fac3 100644 --- a/lib/pleroma/reverse_proxy/client/hackney.ex +++ b/lib/pleroma/reverse_proxy/client/hackney.ex @@ -7,6 +7,7 @@ defmodule Pleroma.ReverseProxy.Client.Hackney do @impl true def request(method, url, headers, body, opts \\ []) do + opts = Keyword.put(opts, :ssl_options, versions: [:"tlsv1.2", :"tlsv1.1", :tlsv1]) :hackney.request(method, url, headers, body, opts) end diff --git a/lib/pleroma/reverse_proxy/client/tesla.ex b/lib/pleroma/reverse_proxy/client/tesla.ex index d5a339681..4b118eec2 100644 --- a/lib/pleroma/reverse_proxy/client/tesla.ex +++ b/lib/pleroma/reverse_proxy/client/tesla.ex @@ -28,7 +28,7 @@ defmodule Pleroma.ReverseProxy.Client.Tesla do url, body, headers, - Keyword.put(opts, :adapter, opts) + opts ) do if is_map(response.body) and method != :head do {:ok, response.status, response.headers, response.body} |