diff options
| author | Robin Appelman <robin@icewind.nl> | 2023-11-07 16:28:27 +0100 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2024-01-31 18:05:09 +0100 |
| commit | e14bceb63fc07a9bde7c8e62605b779d673e91c0 (patch) | |
| tree | c7ead3801f0b0b57aa2e6c9d71024ce0cb81b8db | |
| parent | 82e02a7f9633277c2fb15af9d6d78333294aecc7 (diff) | |
| download | nextcloud-server-e14bceb63fc07a9bde7c8e62605b779d673e91c0.tar.gz nextcloud-server-e14bceb63fc07a9bde7c8e62605b779d673e91c0.zip | |
dont reuse etag for folders marked explicitly unscanned
Signed-off-by: Robin Appelman <robin@icewind.nl>
| -rw-r--r-- | lib/private/Files/Cache/Scanner.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Files/Cache/Scanner.php b/lib/private/Files/Cache/Scanner.php index 2711fc8ad19..e1e3528c978 100644 --- a/lib/private/Files/Cache/Scanner.php +++ b/lib/private/Files/Cache/Scanner.php @@ -203,7 +203,8 @@ class Scanner extends BasicEmitter implements IScanner { $fileId = $cacheData['fileid']; $data['fileid'] = $fileId; // only reuse data if the file hasn't explicitly changed - if (isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime']) { + $mtimeUnchanged = isset($data['storage_mtime']) && isset($cacheData['storage_mtime']) && $data['storage_mtime'] === $cacheData['storage_mtime']; + if ($mtimeUnchanged && $cacheData['size'] !== -1) { $data['mtime'] = $cacheData['mtime']; if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) { $data['size'] = $cacheData['size']; |