diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-05-30 15:51:19 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-05-30 15:51:19 +0000 |
| commit | e96765df6b04fe5e9766271a9c62e559392758b2 (patch) | |
| tree | 2e7096847ea25daa5e3308cb46445245b8815b6f /lib | |
| parent | beeeed5b58193069798c5b754863244e97e68756 (diff) | |
| parent | 0cb7b0ea8477bdd7af2e5e9071843be5b8623dff (diff) | |
| download | pleroma-e96765df6b04fe5e9766271a9c62e559392758b2.tar.gz pleroma-e96765df6b04fe5e9766271a9c62e559392758b2.zip | |
Merge branch 'chore/bump-hackney' into 'develop'
mix.lock: update hackney to 1.16.0
Closes #1612
See merge request pleroma/pleroma!2614
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/http/adapter_helper/hackney.ex | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/pleroma/http/adapter_helper/hackney.ex b/lib/pleroma/http/adapter_helper/hackney.ex index dcb4cac71..3972a03a9 100644 --- a/lib/pleroma/http/adapter_helper/hackney.ex +++ b/lib/pleroma/http/adapter_helper/hackney.ex @@ -22,22 +22,7 @@ defmodule Pleroma.HTTP.AdapterHelper.Hackney do |> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy) end - defp add_scheme_opts(opts, %URI{scheme: "http"}), do: opts - - defp add_scheme_opts(opts, %URI{scheme: "https", host: host}) do - ssl_opts = [ - ssl_options: [ - # Workaround for remote server certificate chain issues - partial_chain: &:hackney_connect.partial_chain/1, - - # We don't support TLS v1.3 yet - versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"], - server_name_indication: to_charlist(host) - ] - ] - - Keyword.merge(opts, ssl_opts) - end + defp add_scheme_opts(opts, _), do: opts def after_request(_), do: :ok end |