aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-08-15 15:34:41 -0500
committerMark Felder <feld@FreeBSD.org>2019-08-15 15:34:41 -0500
commit6a3b1a526eb1a3ea49aca7914ed7ba8736c52059 (patch)
treebceec6a617a12f8f720bc1b3991523f11a4ca9f4
parent4a5b0965a0d07d45bfc4687c80c752ec824457cc (diff)
downloadpleroma-6a3b1a526eb1a3ea49aca7914ed7ba8736c52059.tar.gz
max_body_size -> max_body_length, as it should be
-rw-r--r--lib/pleroma/reverse_proxy/reverse_proxy.ex4
-rw-r--r--test/reverse_proxy_test.exs4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/reverse_proxy/reverse_proxy.ex b/lib/pleroma/reverse_proxy/reverse_proxy.ex
index 1f98f215c..7518e4c3c 100644
--- a/lib/pleroma/reverse_proxy/reverse_proxy.ex
+++ b/lib/pleroma/reverse_proxy/reverse_proxy.ex
@@ -109,7 +109,7 @@ defmodule Pleroma.ReverseProxy do
end
with {:ok, code, headers, client} <- request(method, url, req_headers, hackney_opts),
- :ok <- header_length_constraint(headers, Keyword.get(opts, :max_body_length)) do
+ :ok <- header_length_constraint(headers, Keyword.get(opts, :max_body_length, @max_body_length)) do
response(conn, client, url, code, headers, opts)
else
{:ok, code, headers} ->
@@ -200,7 +200,7 @@ defmodule Pleroma.ReverseProxy do
{:ok, data} <- client().stream_body(client),
{:ok, duration} <- increase_read_duration(duration),
sent_so_far = sent_so_far + byte_size(data),
- :ok <- body_size_constraint(sent_so_far, Keyword.get(opts, :max_body_size)),
+ :ok <- body_size_constraint(sent_so_far, Keyword.get(opts, :max_body_length, @max_body_length)),
{:ok, conn} <- chunk(conn, data) do
chunk_reply(conn, client, opts, sent_so_far, duration)
else
diff --git a/test/reverse_proxy_test.exs b/test/reverse_proxy_test.exs
index f4b7d6add..3a83c4c48 100644
--- a/test/reverse_proxy_test.exs
+++ b/test/reverse_proxy_test.exs
@@ -108,11 +108,11 @@ defmodule Pleroma.ReverseProxyTest do
end
end
- test "max_body_size returns error if streaming body more than that option", %{conn: conn} do
+ test "max_body_length returns error if streaming body more than that option", %{conn: conn} do
stream_mock(3, true)
assert capture_log(fn ->
- ReverseProxy.call(conn, "/stream-bytes/50", max_body_size: 30)
+ ReverseProxy.call(conn, "/stream-bytes/50", max_body_length: 30)
end) =~
"[warn] Elixir.Pleroma.ReverseProxy request to /stream-bytes/50 failed while reading/chunking: :body_too_large"
end