diff options
| author | lain <lain@soykaf.club> | 2020-09-07 15:00:14 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-07 15:00:14 +0200 |
| commit | d00f74e036735c1c238f661076f2925b39daa6ac (patch) | |
| tree | d70d9fcfb1b815406b739ac5b012846fd0622a2f /lib/pleroma/http/adapter_helper | |
| parent | bb007b9298b514c305dff944bef8463ffe1596a8 (diff) | |
| parent | 6c6de8e5dfaf245e4e16ddca0c741342eeaa9187 (diff) | |
| download | pleroma-matrix-explorations.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into matrix-explorationsmatrix-explorations
Diffstat (limited to 'lib/pleroma/http/adapter_helper')
| -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 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 |