hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'temp-hackney-fix' into 'develop'

Browse source 
temp hackney fix

See merge request pleroma/pleroma!2951
This commit is contained in:
rinpatch 2020-09-07 12:47:43 +00:00
commit 27c3973b78
4 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/http/adapter_helper/hackney.ex
View file

@ -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()}

1
lib/pleroma/reverse_proxy/client/hackney.ex
View file

@ -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