Skip to content

[stable26] dont reuse etag for folders marked explicitly unscanned #43245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
backportbot wants to merge 4 commits into from
Closed

[stable26] dont reuse etag for folders marked explicitly unscanned #43245

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c81781d
dont reuse etag for folders marked explicitly unscanned
icewind1991 Nov 7, 2023
d1c7a0a
add test for updating etag with unchanged mtime
icewind1991 Nov 7, 2023
0054e13
add test for updating etag with unchanged mtime in child folder
icewind1991 Nov 22, 2023
b2f39d4
also updated parent etags when a changed etag is detected during scan…
icewind1991 Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
dont reuse etag for folders marked explicitly unscanned 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @artonge
icewind1991 authored and artonge committed Feb 29, 2024
commit c81781d05d03954e04027f596ab4ee000921bda8
3 changes: 2 additions & 1 deletion lib/private/Files/Cache/Scanner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ public function scanFile($file, $reuseExisting = 0, $parentId = -1, $cacheData =
$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'];
Expand Down