Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'

[akkoma] / lib / pleroma / http / connection.ex

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 66e0d056892ccc55dbb8d5a2b249b38f60dd552b..699d80cd7a7d24f8f3782f2d81742276fc4eb4ac 100644 (file)
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -1,12 +1,16 @@
+# 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 [
-    pool: :default,
     timeout: 10000,
-    recv_timeout: 20000
+    recv_timeout: 20000,
+    follow_redirect: true
   ]
   @adapter Application.get_env(:tesla, :adapter)
 
@@ -24,7 +28,7 @@ defmodule Pleroma.HTTP.Connection do
 
   # fetch Hackney options
   #
-  defp hackney_options(opts \\ []) do
+  defp hackney_options(opts) do
     options = Keyword.get(opts, :adapter, [])
     @hackney_options ++ options
   end