projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
[akkoma]
/
lib
/
pleroma
/
reverse_proxy
/
client
/
hackney.ex
diff --git
a/lib/pleroma/reverse_proxy/client/hackney.ex
b/lib/pleroma/reverse_proxy/client/hackney.ex
index e41560ab09e607008ecbe64e58915b759ff7e9e8..dba946308e81fb266113da2e2ff7fb47b862e37e 100644
(file)
--- a/
lib/pleroma/reverse_proxy/client/hackney.ex
+++ b/
lib/pleroma/reverse_proxy/client/hackney.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.ReverseProxy.Client.Hackney do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.ReverseProxy.Client.Hackney do
@@
-7,6
+7,7
@@
defmodule Pleroma.ReverseProxy.Client.Hackney do
@impl true
def request(method, url, headers, body, opts \\ []) 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
:hackney.request(method, url, headers, body, opts)
end