projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/mrf-simple' into 'develop'
[akkoma]
/
lib
/
pleroma
/
http
/
connection.ex
diff --git
a/lib/pleroma/http/connection.ex
b/lib/pleroma/http/connection.ex
index c0173465ab741d9bf39b41750865cdbe7f30c3e7..558005c19260e96cee699783847c17c1980ea884 100644
(file)
--- a/
lib/pleroma/http/connection.ex
+++ b/
lib/pleroma/http/connection.ex
@@
-8,7
+8,7
@@
defmodule Pleroma.HTTP.Connection do
"""
@hackney_options [
- connect_timeout:
2
_000,
+ connect_timeout:
10
_000,
recv_timeout: 20_000,
follow_redirect: true,
pool: :federation