X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fconnection.ex;h=699d80cd7a7d24f8f3782f2d81742276fc4eb4ac;hb=f3045a179e40bd8f670be588a8e93b8d05e95d27;hp=66e0d056892ccc55dbb8d5a2b249b38f60dd552b;hpb=27792b2d77564717e7d4063ab3524ab9e1cb1fb6;p=akkoma diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex index 66e0d0568..699d80cd7 100644 --- 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 +# 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