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

Merge branch 'develop' into media-preview-proxy

Browse source
This commit is contained in:
Mark Felder 2020-09-09 11:11:36 -05:00
commit 4ee99dafcc
123 changed files with 1809 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

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