http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout

2019-03-07 23:49:02 +00:00 · 2019-03-07 23:49:02 +00:00 · 19afd9f81f
commit 19afd9f81f
parent 773f532b14
4 changed files with 2 additions and 5 deletions
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@ -1452,7 +1452,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
               url,
               [],
               adapter: [
-                 timeout: timeout,
                 recv_timeout: timeout,
                 pool: :default
               ]