diff options
| author | lain <lain@soykaf.club> | 2022-06-06 11:36:21 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2022-06-06 11:36:21 +0000 |
| commit | 75f912c63f9a18e37f8ddbd403755b878467435a (patch) | |
| tree | b6de0472c58389d510a80bfcc15270608d4b5f28 /lib | |
| parent | 7466136ad3288cc2b442495d40af6e0787b250fb (diff) | |
| parent | 6f23fc8e08ae5a968cd9aa8dd8744e21ee9e3872 (diff) | |
| download | pleroma-75f912c63f9a18e37f8ddbd403755b878467435a.tar.gz pleroma-75f912c63f9a18e37f8ddbd403755b878467435a.zip | |
Merge branch 'hackney_reenable_TLSv1.3' into 'develop'
hackney adapter helper: enable TLSv1.3
See merge request pleroma/pleroma!3661
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, 0 insertions, 5 deletions
diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex index b4f2f0cc2..f3be1f3d0 100644 --- a/lib/pleroma/http/adapter_helper/hackney.ex +++ b/lib/pleroma/http/adapter_helper/hackney.ex @@ -24,10 +24,6 @@ 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 defp maybe_add_with_body(opts) do diff --git a/lib/pleroma/reverse_proxy/client/hackney.ex b/lib/pleroma/reverse_proxy/client/hackney.ex index 41eaf06cc..d3e986912 100644 --- a/lib/pleroma/reverse_proxy/client/hackney.ex +++ b/lib/pleroma/reverse_proxy/client/hackney.ex @@ -7,7 +7,6 @@ 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 |