Merge branch 'fix/upload-limit-otp' into 'develop'

Actually fix upload limit on OTP releases

Closes #1109

See merge request pleroma/pleroma!2185
This commit is contained in:
lain 2020-02-08 14:02:36 +00:00
commit 964b4d82a0
4 changed files with 13 additions and 23 deletions

View file

@ -61,7 +61,17 @@ defmodule Pleroma.Web.Endpoint do
plug(Plug.RequestId)
plug(Plug.Logger, log: :debug)
plug(Pleroma.Plugs.Parsers)
plug(Plug.Parsers,
parsers: [
:urlencoded,
{:multipart, length: {Pleroma.Config, :get, [[:instance, :upload_limit]]}},
:json
],
pass: ["*/*"],
json_decoder: Jason,
length: Pleroma.Config.get([:instance, :upload_limit]),
body_reader: {Pleroma.Web.Plugs.DigestPlug, :read_body, []}
)
plug(Plug.MethodOverride)
plug(Plug.Head)