[Pkg-owncloud-commits] [owncloud] 146/165: Merge pull request #15757 from owncloud/enc-fixfeofforlastblock

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 570718fb6bbad4dfd721b1ef451580749e9e0bdd
Merge: d7bdf60 76dad29
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Wed Apr 22 11:32:21 2015 +0200

    Merge pull request #15757 from owncloud/enc-fixfeofforlastblock
    
    Fix encryption feof to not return too early

 lib/private/files/stream/encryption.php |  4 +++
 tests/data/block-aligned-plus-one.txt   | 25 ++++++++++++++++++
 tests/data/block-aligned.txt            | 25 ++++++++++++++++++
 tests/lib/files/stream/encryption.php   | 46 ++++++++++++++++++++++++++++-----
 4 files changed, 94 insertions(+), 6 deletions(-)

diff --cc tests/lib/files/stream/encryption.php
index 4d932ab,ae67d9a..25e7e54
--- a/tests/lib/files/stream/encryption.php
+++ b/tests/lib/files/stream/encryption.php
@@@ -8,13 -8,11 +8,13 @@@ use OCA\Encryption_Dummy\DummyModule
  class Encryption extends \Test\TestCase {
  
  	/**
 +	 * @param string $fileName
  	 * @param string $mode
 -	 * @param integer $limit
 +	 * @param integer $unencryptedSize
 +	 * @return resource
  	 */
  	protected function getStream($fileName, $mode, $unencryptedSize) {
- 
+ 		clearstatcache();
  		$size = filesize($fileName);
  		$source = fopen($fileName, $mode);
  		$internalPath = $fileName;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git