Skip to content

[stable22] s3 external storage fixes #29391

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
MichaIng merged 11 commits into from
Oct 23, 2021
Merged

[stable22] s3 external storage fixes #29391

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a4a4097
s3 external storage listing rework
icewind1991 Oct 13, 2021
804a709
doesDirectoryExist fixes
icewind1991 Oct 14, 2021
30f0d99
more reliable directory copy
icewind1991 Oct 14, 2021
a3d365b
ci
icewind1991 Oct 14, 2021
01cd477
optimize filetype for s3 directories a bit
icewind1991 Oct 15, 2021
7983ded
remove old migration method
icewind1991 Oct 15, 2021
4108655
more reliable hasUpdated for s3
icewind1991 Oct 15, 2021
5f43837
more reliable return value for Watcher::checkUpdate
icewind1991 Oct 15, 2021
d85c0f0
always set Key field in `headObject`
icewind1991 Oct 15, 2021
da4712b
minor directory detect improvements
icewind1991 Oct 19, 2021
e623900
cache versioning enabled status
icewind1991 Oct 19, 2021
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
Prev Previous commit
Next Next commit
minor directory detect improvements 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed Oct 22, 2021
commit da4712b62c3625f43110d4ffbb8524a7b2b318ab
4 changes: 2 additions & 2 deletions apps/files_external/lib/Lib/Storage/AmazonS3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private function doesDirectoryExist($path) {
return true;
}
} catch (S3Exception $e) {
if ($e->getStatusCode() === 403) {
if ($e->getStatusCode() >= 400 && $e->getStatusCode() < 500) {
$this->directoryCache[$path] = false;
}
throw $e;
Expand Down Expand Up @@ -422,7 +422,7 @@ public function filetype($path) {
}

try {
if (isset($this->directoryCache[$path])) {
if (isset($this->directoryCache[$path]) && $this->directoryCache[$path]) {
return 'dir';
}
if (isset($this->filesCache[$path]) || $this->headObject($path)) {
Expand Down