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/http/adapter_helper/hackney.ex | |
| parent | 73dd5bdb7dcdf804bdbabcf632671d4de5042ebc (diff) | |
| parent | 073f5490ece616fd9602382c1be1347457cbbe79 (diff) | |
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/http/adapter_helper/hackney.ex')
| -rw-r--r-- | lib/pleroma/http/adapter_helper/hackney.ex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex index cd569422b..62bd42485 100644 --- a/lib/pleroma/http/adapter_helper/hackney.ex +++ b/lib/pleroma/http/adapter_helper/hackney.ex @@ -22,6 +22,10 @@ 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 @spec get_conn(URI.t(), keyword()) :: {:ok, keyword()} |