Skip to content

Fixes the undefined index error with the DAV property getlastmodified #31632

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
artonge merged 4 commits into from
Mar 29, 2022
Merged

Fixes the undefined index error with the DAV property getlastmodified #31632

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee88887
Fixes the undefined index error with the DAV property getlastmodified
Maaxxs Mar 19, 2022
e0a5fe6
Fix typo.
Maaxxs Mar 20, 2022
3a135f0
Set `mtime` to null instead of false if `getlastmodified` does not ex…
Maaxxs Mar 23, 2022
2952c7d
Use the null coalescing operator to set the value of `size`.
Maaxxs Mar 28, 2022
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
7 changes: 5 additions & 2 deletions lib/private/Files/Storage/DAV.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ public function stat($path) {
return false;
}
return [
'mtime' => strtotime($response['{DAV:}getlastmodified']),
'mtime' => isset($response['{DAV:}getlastmodified']) ? strtotime($response['{DAV:}getlastmodified']) : null,
'size' => (int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
];
} catch (\Exception $e) {
Expand Down Expand Up @@ -804,9 +804,12 @@ public function hasUpdated($path, $time) {
} else {
return false;
}
} else {
} elseif (isset($response['{DAV:}getlastmodified'])) {
$remoteMtime = strtotime($response['{DAV:}getlastmodified']);
return $remoteMtime > $time;
} else {
// neither `getetag` nor `getlastmodified` is set
return false;
}
} catch (ClientHttpException $e) {
if ($e->getHttpStatus() === 405) {
Expand Down