diff options
| author | Piotr M <mrow4a@yahoo.com> | 2017-03-28 14:49:06 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-04-12 12:54:20 +0200 |
| commit | dc78f1251eee236e65386439e51b8f45b1bc9d2d (patch) | |
| tree | c822aeb2f5699f60a918cd90231a05f343cf28b9 /lib/private/Files | |
| parent | af42ca20252b166bec2da34970137ec790a18328 (diff) | |
| download | nextcloud-server-dc78f1251eee236e65386439e51b8f45b1bc9d2d.tar.gz nextcloud-server-dc78f1251eee236e65386439e51b8f45b1bc9d2d.zip | |
Optimize put - Dont try to fetch filecache for not existing filecache in encription
Diffstat (limited to 'lib/private/Files')
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/Encryption.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/private/Files/Storage/Wrapper/Encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php index c0ccd22d147..793849914d7 100644 --- a/lib/private/Files/Storage/Wrapper/Encryption.php +++ b/lib/private/Files/Storage/Wrapper/Encryption.php @@ -910,7 +910,8 @@ class Encryption extends Wrapper { */ protected function getHeader($path) { $realFile = $this->util->stripPartialFileExtension($path); - if ($this->storage->file_exists($realFile)) { + $exists = $this->storage->file_exists($realFile); + if ($exists) { $path = $realFile; } @@ -922,8 +923,9 @@ class Encryption extends Wrapper { if (!isset($result[Util::HEADER_ENCRYPTION_MODULE_KEY])) { if (!empty($result)) { $result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE'; - } else { + } else if ($exists) { // if the header was empty we have to check first if it is a encrypted file at all + // We would do query to filecache only if we know that entry in filecache exists $info = $this->getCache()->get($path); if (isset($info['encrypted']) && $info['encrypted'] === true) { $result[Util::HEADER_ENCRYPTION_MODULE_KEY] = 'OC_DEFAULT_MODULE'; |