projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
[akkoma]
/
lib
/
pleroma
/
http
/
connection.ex
diff --git
a/lib/pleroma/http/connection.ex
b/lib/pleroma/http/connection.ex
index 5e8f2aabd1b3ed26b70ea548cae283da232962a3..7b11060b25d0b4366798a90e7fd507cd37ef92bc 100644
(file)
--- a/
lib/pleroma/http/connection.ex
+++ b/
lib/pleroma/http/connection.ex
@@
-3,7
+3,12
@@
defmodule Pleroma.HTTP.Connection do
Connection for http-requests.
"""
Connection for http-requests.
"""
- @hackney_options [pool: :default]
+ @hackney_options [
+ pool: :default,
+ timeout: 10000,
+ recv_timeout: 20000,
+ follow_redirect: true
+ ]
@adapter Application.get_env(:tesla, :adapter)
@doc """
@adapter Application.get_env(:tesla, :adapter)
@doc """
@@
-20,7
+25,7
@@
defmodule Pleroma.HTTP.Connection do
# fetch Hackney options
#
# fetch Hackney options
#
- defp hackney_options(opts
\\ []
) do
+ defp hackney_options(opts) do
options = Keyword.get(opts, :adapter, [])
@hackney_options ++ options
end
options = Keyword.get(opts, :adapter, [])
@hackney_options ++ options
end