summaryrefslogtreecommitdiffstats
path: root/lib/private/files/stream
diff options
context:
space:
mode:
authorBjörn Schießle <bjoern@schiessle.org>2015-04-22 11:32:21 +0200
committerBjörn Schießle <bjoern@schiessle.org>2015-04-22 11:32:21 +0200
commit570718fb6bbad4dfd721b1ef451580749e9e0bdd (patch)
treec3a71fb88f42447ecb13026edefbcdb070480636 /lib/private/files/stream
parentd7bdf6055902054233b0803a1a69ddd9d6ffce52 (diff)
parent76dad297ffc4084d2057e2c2312f0c53f1e15f5b (diff)
downloadnextcloud-server-570718fb6bbad4dfd721b1ef451580749e9e0bdd.tar.gz
nextcloud-server-570718fb6bbad4dfd721b1ef451580749e9e0bdd.zip
Merge pull request #15757 from owncloud/enc-fixfeofforlastblock
Fix encryption feof to not return too early
Diffstat (limited to 'lib/private/files/stream')
-rw-r--r--lib/private/files/stream/encryption.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index 79493311a43..910357eef45 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -242,6 +242,10 @@ class Encryption extends Wrapper {
}
+ public function stream_eof() {
+ return $this->position >= $this->unencryptedSize;
+ }
+
public function stream_read($count) {
$result = '';