commit: 31c06dba5afdc6ab8d63a5acd0bda55e7620010d
parent: 42d2c8d95bbf03508c46ac95ef548b12944a7d45
Author: kaniini <nenolod@gmail.com>
Date: Thu, 11 Apr 2019 17:54:31 +0000
Merge branch 'fix/hackney_max_body_param' into 'develop'
Add `with_body: true` to requests relying on `max_body: val`
Closes #778
See merge request pleroma/pleroma!1049
Diffstat:
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex
@@ -6,7 +6,8 @@ defmodule Pleroma.Web.RelMe do
@hackney_options [
pool: :media,
recv_timeout: 2_000,
- max_body: 2_000_000
+ max_body: 2_000_000,
+ with_body: true
]
if Mix.env() == :test do
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex
@@ -12,7 +12,8 @@ defmodule Pleroma.Web.RichMedia.Parser do
@hackney_options [
pool: :media,
recv_timeout: 2_000,
- max_body: 2_000_000
+ max_body: 2_000_000,
+ with_body: true
]
def parse(nil), do: {:error, "No URL provided"}