Skip to content

[stable27] fix(dav): Fix quota check for chunk upload #44656

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

Merged
skjnldsv merged 2 commits into from
Apr 4, 2024
Merged

[stable27] fix(dav): Fix quota check for chunk upload #44656

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a007651
fix(dav): Fix quota check for chunk upload
come-nc Mar 19, 2024
06c713d
chore(dav): Fix tests for length headers on upload
come-nc Mar 21, 2024
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
Next Next commit
fix(dav): Fix quota check for chunk upload 
Do not ignore OC-Total-Length when Content-Length and
 X-Expected-Entity-Length are missing

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Apr 4, 2024
commit a007651d202aada80d865017e12f676f8ed9c88d
10 changes: 6 additions & 4 deletions apps/dav/lib/Connector/Sabre/QuotaPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,13 @@ public function getLength() {
}

$ocLength = $req->getHeader('OC-Total-Length');
if (is_numeric($length) && is_numeric($ocLength)) {
return max($length, $ocLength);
if (!is_numeric($ocLength)) {
return $length;
}

return $length;
if (!is_numeric($length)) {
return $ocLength;
}
return max($length, $ocLength);
}

/**
Expand Down