summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2013-03-26 23:42:00 +0100
committerArthur Schiwon <blizzz@owncloud.com>2013-03-27 19:20:08 +0100
commit78c694b6eef18f6cc91e939aaa8abe33e81bc7f5 (patch)
treeaba6db9c01150616eeb68bc17a666351a40d82fa /lib
parent3d29a82150d14ee9489b6d40a39b66d0c07cf1de (diff)
downloadnextcloud-server-78c694b6eef18f6cc91e939aaa8abe33e81bc7f5.tar.gz
nextcloud-server-78c694b6eef18f6cc91e939aaa8abe33e81bc7f5.zip
Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy
Diffstat (limited to 'lib')
-rw-r--r--lib/files/cache/scanner.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 2517118058b..661ece5b120 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -75,7 +75,8 @@ class Scanner {
}
}
if($cacheData = $this->cache->get($file)) {
- if ($data['mtime'] === $cacheData['mtime']) {
+ if ($data['mtime'] === $cacheData['mtime'] &&
+ $data['size'] === $cacheData['size']) {
$data['etag'] = $cacheData['etag'];
}
}