aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-09-28 17:31:42 +0200
committerGitHub <noreply@github.com>2018-09-28 17:31:42 +0200
commit48d359ccb68d99df523d6fad4102ec8659154fe7 (patch)
treea10ad80c6bd6df911655446fca8ba2abc0372a85 /apps
parentb70d8d083288780304b3a29bce994faf23c4ef10 (diff)
parenteae523eb56e5a74b7143c598839e3944a410742f (diff)
downloadnextcloud-server-48d359ccb68d99df523d6fad4102ec8659154fe7.tar.gz
nextcloud-server-48d359ccb68d99df523d6fad4102ec8659154fe7.zip
Merge pull request #11437 from nextcloud/assemblystream-eof-13
[13] AssemblyStream is also eof if we have no more source stream
Diffstat (limited to 'apps')
-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;
}
/**