Merge pull request #55654 from nextcloud/artonge/fix/do_not_happen_streams

2026-04-22 14:50:17 -04:00 · 2025-10-10 14:43:05 +02:00 · 2025-10-10 14:43:05 +02:00 · 9dfd6f1533
commit 9dfd6f1533
parent c89ca89f2f 00ec57efd6
1 changed files with 13 additions and 1 deletions
--- a/lib/private/Files/ObjectStore/S3ObjectTrait.php
+++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@ -222,7 +222,19 @@ trait S3ObjectTrait {
 				// buffer is fully seekable, so use it directly for the small upload
 				$this->writeSingle($urn, $buffer, $metaData);
 			} else {
-				$loadStream = new Psr7\AppendStream([$buffer, $psrStream]);
+				if ($psrStream->isSeekable()) {
+					// If the body is seekable, just rewind the body.
+					$psrStream->rewind();
+					$loadStream = $psrStream;
+				} else {
+					// If the body is non-seekable, stitch the rewind the buffer and
+					// the partially read body together into one stream. This avoids
+					// unnecessary disk usage and does not require seeking on the
+					// original stream.
+					$buffer->rewind();
+					$loadStream = new Psr7\AppendStream([$buffer, $psrStream]);
+				}
+
 				$this->writeMultiPart($urn, $loadStream, $metaData);
 			}
 		} else {