alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
kaniini 2019-04-11 17:54:31 +00:00
parent 42d2c8d95b 4615e56219
commit 31c06dba5a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/rel_me.ex
View File

@ -6,7 +6,8 @@ defmodule Pleroma.Web.RelMe do
@hackney_options [ @hackney_options [
pool: :media, pool: :media,
recv_timeout: 2_000, recv_timeout: 2_000,
max_body: 2_000_000 max_body: 2_000_000,
with_body: true
] ]
if Mix.env() == :test do if Mix.env() == :test do

3
lib/pleroma/web/rich_media/parser.ex
View File

@ -12,7 +12,8 @@ defmodule Pleroma.Web.RichMedia.Parser do
@hackney_options [ @hackney_options [
pool: :media, pool: :media,
recv_timeout: 2_000, 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"} def parse(nil), do: {:error, "No URL provided"}