aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/rich_media
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-03-07 23:49:02 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-03-08 22:56:16 +0000
commit19afd9f81ff0b0e966a432db6ea15930d3712c85 (patch)
tree6957e177d77defbd07b14aca610c560b0cbd2345 /lib/pleroma/web/rich_media
parent773f532b148eb0c9ca1e73c3b4ebaf6aa8337da9 (diff)
downloadpleroma-19afd9f81ff0b0e966a432db6ea15930d3712c85.tar.gz
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
Diffstat (limited to 'lib/pleroma/web/rich_media')
-rw-r--r--lib/pleroma/web/rich_media/parser.ex1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex
index 4341141df..4bd271d8e 100644
--- a/lib/pleroma/web/rich_media/parser.ex
+++ b/lib/pleroma/web/rich_media/parser.ex
@@ -11,7 +11,6 @@ defmodule Pleroma.Web.RichMedia.Parser do
@hackney_options [
pool: :media,
- timeout: 2_000,
recv_timeout: 2_000,
max_body: 2_000_000
]