projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#491] Made full nicknames be preserved in user links text only in Bio.
[akkoma]
/
lib
/
pleroma
/
http
/
connection.ex
diff --git
a/lib/pleroma/http/connection.ex
b/lib/pleroma/http/connection.ex
index db46f9e5540f6bd9e9e3c66d35ef0e292d95c18e..699d80cd7a7d24f8f3782f2d81742276fc4eb4ac 100644
(file)
--- a/
lib/pleroma/http/connection.ex
+++ b/
lib/pleroma/http/connection.ex
@@
-1,10
+1,13
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.HTTP.Connection do
@moduledoc """
Connection for http-requests.
"""
@hackney_options [
defmodule Pleroma.HTTP.Connection do
@moduledoc """
Connection for http-requests.
"""
@hackney_options [
- pool: :default,
timeout: 10000,
recv_timeout: 20000,
follow_redirect: true
timeout: 10000,
recv_timeout: 20000,
follow_redirect: true
@@
-25,7
+28,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