summaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-02-20 10:28:21 +0100
committerGitHub <noreply@github.com>2019-02-20 10:28:21 +0100
commit4c8cfd224c770a65ceb115ca521e2a848402724d (patch)
tree77533cc5924c2cb276e72dc6d1111f59768939f0 /apps/dav
parent2b76e27aad331704ca647746010e68629577ec0c (diff)
parent719b70108de60fd46bb70fe54a651941e96970a0 (diff)
downloadnextcloud-server-4c8cfd224c770a65ceb115ca521e2a848402724d.tar.gz
nextcloud-server-4c8cfd224c770a65ceb115ca521e2a848402724d.zip
Merge pull request #14299 from nextcloud/fix/14298/fix_storages_not_closing_handle
Hanlde writestream not closing source
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/lib/Connector/Sabre/File.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
index 388bcff9206..8aa7d66ba34 100644
--- a/apps/dav/lib/Connector/Sabre/File.php
+++ b/apps/dav/lib/Connector/Sabre/File.php
@@ -181,8 +181,12 @@ class File extends Node implements IFile {
$count = $partStorage->writeStream($internalPartPath, $wrappedData);
$result = $count > 0;
+
if ($result === false) {
$result = $isEOF;
+ if (is_resource($wrappedData)) {
+ $result = feof($wrappedData);
+ }
}
} else {