diff options
author | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:21:12 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:21:12 +0000 |
commit | 425324aae3d4534bc045466a1cc15653ddfa27d2 (patch) | |
tree | 2d785eb4396e2dc79bb6b0bed5d766b393479dd5 /lib/pleroma/reverse_proxy | |
parent | 73dd5bdb7dcdf804bdbabcf632671d4de5042ebc (diff) | |
parent | 073f5490ece616fd9602382c1be1347457cbbe79 (diff) | |
download | pleroma-2.1.1.tar.gz |
Merge branch 'release/2.1.1' into 'stable'v2.1.1
2.1.1 release
See merge request pleroma/secteam/pleroma!13
Diffstat (limited to 'lib/pleroma/reverse_proxy')
-rw-r--r-- | lib/pleroma/reverse_proxy/client/hackney.ex | 1 |
1 files changed, 1 insertions, 0 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 |