X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhttp%2Fconnection.ex;h=699d80cd7a7d24f8f3782f2d81742276fc4eb4ac;hb=bf5b1c7f06c9f8882c40cf2385439bee3b74522c;hp=db46f9e5540f6bd9e9e3c66d35ef0e292d95c18e;hpb=abead01ab6f5586e60d467d7efd0de560a97c5bd;p=akkoma diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex index db46f9e55..699d80cd7 100644 --- 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 +# 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, follow_redirect: true @@ -25,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