Skip to content

Fix not respecting unlimited post_max_size #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
VasekPurchart wants to merge 1 commit into from
Closed

Fix not respecting unlimited post_max_size #473

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Middleware/RequestBodyBufferMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ final class RequestBodyBufferMiddleware
public function __construct($sizeLimit = null)
{
if ($sizeLimit === null) {
$sizeLimit = \ini_get('post_max_size');
$iniSizeLimit = \ini_get('post_max_size');
$sizeLimit = $iniSizeLimit !== '0' ? $iniSizeLimit : null;
}
Copy link
Member

@clue clue Oct 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now, a zero value will only mean "unlimited" when not given explicitly and read from post_max_size. This makes it a bit inconsistent with passing $sizeLimit explicitly and also makes it harder to test. Should both paths be handled consistently here? Among others, this should make testing this feature much easier.


$this->sizeLimit = IniUtil::iniSizeToBytes($sizeLimit);
$this->sizeLimit = $sizeLimit !== null ? IniUtil::iniSizeToBytes($sizeLimit) : null;
}

public function __invoke(ServerRequestInterface $request, $stack)
Expand All @@ -37,7 +38,7 @@ public function __invoke(ServerRequestInterface $request, $stack)
// happy path: skip if body is known to be empty (or is already buffered)
if ($size === 0 || !$body instanceof ReadableStreamInterface) {
// replace with empty body if body is streaming (or buffered size exceeds limit)
if ($body instanceof ReadableStreamInterface || $size > $this->sizeLimit) {
if ($body instanceof ReadableStreamInterface || ($this->sizeLimit !== null && $size > $this->sizeLimit)) {
$request = $request->withBody(new BufferedBody(''));
}

Expand All @@ -46,7 +47,7 @@ public function __invoke(ServerRequestInterface $request, $stack)

// request body of known size exceeding limit
$sizeLimit = $this->sizeLimit;
if ($size > $this->sizeLimit) {
if ($this->sizeLimit !== null && $size > $this->sizeLimit) {
$sizeLimit = 0;
}

Expand Down