upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #44332 from nextcloud/fix/fix-chunkupload-quota-check

Browse source 
fix(dav): Fix quota check for chunk upload
This commit is contained in:
Côme Chilliet 2024-04-02 17:44:21 +02:00 committed by GitHub
commit 9aa7225ed3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/dav/lib/Connector/Sabre/QuotaPlugin.php
View file

@ -250,11 +250,13 @@ class QuotaPlugin extends \Sabre\DAV\ServerPlugin {
}
$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);
}
/**

5
apps/dav/tests/unit/Connector/Sabre/QuotaPluginTest.php
View file

@ -42,7 +42,6 @@ use Test\TestCase;
* See the COPYING-README file.
*/
class QuotaPluginTest extends TestCase {
/** @var \Sabre\DAV\Server | \PHPUnit\Framework\MockObject\MockObject */
private $server;
@ -149,8 +148,8 @@ class QuotaPluginTest extends TestCase {
[null, ['CONTENT-LENGTH' => 'A']],
[1024, ['OC-TOTAL-LENGTH' => 'A', 'CONTENT-LENGTH' => '1024']],
[1024, ['OC-TOTAL-LENGTH' => 'A', 'X-EXPECTED-ENTITY-LENGTH' => '1024']],
[null, ['OC-TOTAL-LENGTH' => '2048', 'X-EXPECTED-ENTITY-LENGTH' => 'A']],
[null, ['OC-TOTAL-LENGTH' => '2048', 'CONTENT-LENGTH' => 'A']],
[2048, ['OC-TOTAL-LENGTH' => '2048', 'X-EXPECTED-ENTITY-LENGTH' => 'A']],
[2048, ['OC-TOTAL-LENGTH' => '2048', 'CONTENT-LENGTH' => 'A']],
];
}