summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-09-28 16:25:49 +0200
committerGitHub <noreply@github.com>2018-09-28 16:25:49 +0200
commit0ded277beac6de3d29d9660f4b3899a3b1024688 (patch)
treecc7aab7bfda40e29c08a2c1742f4a76695721a69
parentd867f9f091933ebc134cc50ba1ed835dbd39d36d (diff)
parent6b7a69752c3d395a87bb27007a9bb673a017a757 (diff)
downloadnextcloud-server-0ded277beac6de3d29d9660f4b3899a3b1024688.tar.gz
nextcloud-server-0ded277beac6de3d29d9660f4b3899a3b1024688.zip
Merge pull request #11432 from nextcloud/assemblystream-eof
AssemblyStream is also eof if we have no more source stream
-rw-r--r--apps/dav/lib/Upload/AssemblyStream.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/dav/lib/Upload/AssemblyStream.php b/apps/dav/lib/Upload/AssemblyStream.php
index e20d8f9adba..3ba24bf60fd 100644
--- a/apps/dav/lib/Upload/AssemblyStream.php
+++ b/apps/dav/lib/Upload/AssemblyStream.php
@@ -182,7 +182,7 @@ class AssemblyStream implements \Icewind\Streams\File {
* @return bool
*/
public function stream_eof() {
- return $this->pos >= $this->size;
+ return $this->pos >= $this->size || $this->currentStream === null;
}
/**