Merge branch 'master' into fix/caldav/access-typed-searchquery-proper…

…ty-without-init
nextcloud · Jul 20, 2023 · 41323b0 · 41323b0
2 parents 2d3d396 + ec4ae84
commit 41323b0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/apps/dav/lib/BulkUpload/MultipartRequestParser.php b/apps/dav/lib/BulkUpload/MultipartRequestParser.php
@@ -211,13 +211,17 @@ private function readPartContent(int $length, string $md5): string {
 			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.");
 		}