aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/reverse_proxy
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-09-07 15:00:14 +0200
committerlain <lain@soykaf.club>2020-09-07 15:00:14 +0200
commitd00f74e036735c1c238f661076f2925b39daa6ac (patch)
treed70d9fcfb1b815406b739ac5b012846fd0622a2f /lib/pleroma/reverse_proxy
parentbb007b9298b514c305dff944bef8463ffe1596a8 (diff)
parent6c6de8e5dfaf245e4e16ddca0c741342eeaa9187 (diff)
downloadpleroma-d00f74e036735c1c238f661076f2925b39daa6ac.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into matrix-explorationsmatrix-explorations
Diffstat (limited to 'lib/pleroma/reverse_proxy')
-rw-r--r--lib/pleroma/reverse_proxy/client/hackney.ex1
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