Browse Source

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
tags/v1.1.4
kaniini 5 years ago
parent
commit
31c06dba5a
2 changed files with 4 additions and 2 deletions
  1. +2
    -1
      lib/pleroma/web/rel_me.ex
  2. +2
    -1
      lib/pleroma/web/rich_media/parser.ex

+ 2
- 1
lib/pleroma/web/rel_me.ex View File

@@ -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


+ 2
- 1
lib/pleroma/web/rich_media/parser.ex View File

@@ -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"}


Loading…
Cancel
Save