From 78c694b6eef18f6cc91e939aaa8abe33e81bc7f5 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 26 Mar 2013 23:42:00 +0100
Subject: Cache: on equal mtime also for equal size before keeping ETag, at
 least makes Unit Test happy

---
 lib/files/cache/scanner.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/files/cache')

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'];
 				}
 			}
-- 
cgit v1.2.3