From e1fe5279ddd848b1ee367184c2c6ba7c763bd4a7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 12 Feb 2013 14:56:57 +0100
Subject: [PATCH] Cache: also preserve etags for files
---
lib/files/cache/scanner.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 7f19261d97..70266c26e6 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -74,8 +74,11 @@ class Scanner {
$this->scanFile($parent);
}
}
- if ($checkExisting and $data['size'] === -1 and $cacheData = $this->cache->get($file)) {
- $data['size'] = $cacheData['size'];
+ if ($checkExisting) {
+ $cacheData = $this->cache->get($file)
+ if ($data['size'] === -1) {
+ $data['size'] = $cacheData['size'];
+ }
if ($data['mtime'] === $cacheData['mtime']) {
$data['etag'] = $cacheData['etag'];
}
--
GitLab