Skip to content

[stable28] dont reuse etag for folders marked explicitly unscanned #43244

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

Merged
susnux merged 4 commits into from
Feb 1, 2024
Merged

[stable28] dont reuse etag for folders marked explicitly unscanned #43244

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b38708a
dont reuse etag for folders marked explicitly unscanned
icewind1991 Nov 7, 2023
f56a8e7
add test for updating etag with unchanged mtime
icewind1991 Nov 7, 2023
404b340
add test for updating etag with unchanged mtime in child folder
icewind1991 Nov 22, 2023
9616d48
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 @backportbot
icewind1991 authored and backportbot[bot] committed Jan 31, 2024
commit b38708afafbaead1fcf1c54c4f7d3dfec504f045
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 @@ -203,7 +203,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