diff options
| author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | 2023-07-07 11:22:19 +0200 |
|---|---|---|
| committer | Matthieu Gallien <matthieu.gallien@nextcloud.com> | 2023-07-24 13:29:33 +0200 |
| commit | 48508288399f478262bf1d4af2d325ef11bf8667 (patch) | |
| tree | 9aca92d1c758a53bbd90218b41af0964f9209594 | |
| parent | 57b0bf316fc0a2b812c65872894ccdc91b069fd7 (diff) | |
| download | nextcloud-server-48508288399f478262bf1d4af2d325ef11bf8667.tar.gz nextcloud-server-48508288399f478262bf1d4af2d325ef11bf8667.zip | |
when reading an empty file getting EOF is not an error
will allow uploading empty files via bulk upload
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
| -rw-r--r-- | apps/dav/lib/BulkUpload/MultipartRequestParser.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/dav/lib/BulkUpload/MultipartRequestParser.php b/apps/dav/lib/BulkUpload/MultipartRequestParser.php index 7554447fc93..16c83fee64e 100644 --- a/apps/dav/lib/BulkUpload/MultipartRequestParser.php +++ b/apps/dav/lib/BulkUpload/MultipartRequestParser.php @@ -211,13 +211,17 @@ class MultipartRequestParser { throw new BadRequest("Computed md5 hash is incorrect."); } - $content = stream_get_line($this->stream, $length); + if ($length === 0) { + $content = ''; + } else { + $content = stream_get_line($this->stream, $length); + } if ($content === false) { throw new Exception("Fail to read part's content."); } - if (feof($this->stream)) { + if ($length !== 0 && feof($this->stream)) { throw new Exception("Unexpected EOF while reading stream."); } |