mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flush() comments + perf opt

This commit is contained in:
jknockaert 2015-05-22 22:13:27 +02:00 committed by Bjoern Schiessle
parent bf6151e799
commit a577e723b0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/files/stream/encryption.php
View File

@ -412,14 +412,16 @@ class Encryption extends Wrapper {
// we are handling that separately here and we don't want to
// get into an infinite loop
$encrypted = $this->encryptionModule->encrypt($this->cache);
parent::stream_write($encrypted);
$bytesWritten = parent::stream_write($encrypted);
$this->writeFlag = false;
// If the write concerns the last block then then update the encrypted filesize
// Check whether the write concerns the last block
// If so then update the encrypted filesize
// Note that the unencrypted pointer and filesize are NOT yet updated when flush() is called
// We recalculate the encrypted filesize as we do not know the context of calling flush()
if ((int)floor($this->unencryptedSize/$this->unencryptedBlockSize) === (int)floor($this->position/$this->unencryptedBlockSize)) {
$this->size = $this->util->getBlockSize() * (int)floor($this->unencryptedSize/$this->unencryptedBlockSize);
$this->size += strlen($encrypted);
$completeBlocksInFile=(int)floor($this->unencryptedSize/$this->unencryptedBlockSize);
if ($completeBlocksInFile === (int)floor($this->position/$this->unencryptedBlockSize)) {
$this->size = $this->util->getBlockSize() * $completeBlocksInFile;
$this->size += $bytesWritten;
$this->size += $this->headerSize;
}
}