diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-11 17:54:31 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-11 17:54:31 +0000 |
| commit | 31c06dba5afdc6ab8d63a5acd0bda55e7620010d (patch) | |
| tree | 57a0abcdbc4d674501148424b4bf33a244e9fadc | |
| parent | 42d2c8d95bbf03508c46ac95ef548b12944a7d45 (diff) | |
| parent | 4615e56219002c4a95edad9f9207cbffa8361e06 (diff) | |
| download | pleroma-31c06dba5afdc6ab8d63a5acd0bda55e7620010d.tar.gz | |
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
| -rw-r--r-- | lib/pleroma/web/rel_me.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/rich_media/parser.ex | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex index eaca41132..26eb614a6 100644 --- 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 index 4bd271d8e..62e8fa610 100644 --- 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"} |