Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2013-03-27 02:42:00 +0400
committerArthur Schiwon <blizzz@owncloud.com>2013-03-27 02:42:00 +0400
commit4411de0dbf7e387ad71aa0184bfd143e2832a199 (patch)
tree79a4b34506136eef7505455293afbd6979daaf9f
parent4384cf70da31636345017fec0b727dc8c4a8cb33 (diff)
Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy
-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 f0b86beb280..e1f5cb1f377 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'];
}
}