diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-07 12:47:43 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-07 12:47:43 +0000 |
| commit | 6c6de8e5dfaf245e4e16ddca0c741342eeaa9187 (patch) | |
| tree | 365c0fc69e7c6bdc78630f81b0cb93db81f351f0 /lib | |
| parent | b5f3694302502bb1f5e15637aea74548c2ceb68a (diff) | |
| parent | 1984ff310341766adfc224342c9d29272f80e9cb (diff) | |
| download | pleroma-6c6de8e5dfaf245e4e16ddca0c741342eeaa9187.tar.gz pleroma-6c6de8e5dfaf245e4e16ddca0c741342eeaa9187.zip | |
Merge branch 'temp-hackney-fix' into 'develop'
temp hackney fix
See merge request pleroma/pleroma!2951
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/http/adapter_helper/hackney.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/reverse_proxy/client/hackney.ex | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex index f47a671ad..42e3acfec 100644 --- a/lib/pleroma/http/adapter_helper/hackney.ex +++ b/lib/pleroma/http/adapter_helper/hackney.ex @@ -22,5 +22,9 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy) end + defp add_scheme_opts(opts, %URI{scheme: "https"}) do + Keyword.put(opts, :ssl_options, versions: [:"tlsv1.2", :"tlsv1.1", :tlsv1]) + end + defp add_scheme_opts(opts, _), do: opts end 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 |