projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'
[akkoma]
/
lib
/
pleroma
/
http
/
connection.ex
diff --git
a/lib/pleroma/http/connection.ex
b/lib/pleroma/http/connection.ex
index 66e0d056892ccc55dbb8d5a2b249b38f60dd552b..35c1490da22813356d6ffc5a7086a79de9f04f24 100644
(file)
--- a/
lib/pleroma/http/connection.ex
+++ b/
lib/pleroma/http/connection.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.HTTP.Connection do
@moduledoc """
Connection for http-requests.
defmodule Pleroma.HTTP.Connection do
@moduledoc """
Connection for http-requests.
@@
-6,7
+10,8
@@
defmodule Pleroma.HTTP.Connection do
@hackney_options [
pool: :default,
timeout: 10000,
@hackney_options [
pool: :default,
timeout: 10000,
- recv_timeout: 20000
+ recv_timeout: 20000,
+ follow_redirect: true
]
@adapter Application.get_env(:tesla, :adapter)
]
@adapter Application.get_env(:tesla, :adapter)
@@
-24,7
+29,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