Skip to content

[stable15] Fix directory detection for s3 #17272

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
rullzer merged 6 commits into from
Oct 1, 2019
Merged

[stable15] Fix directory detection for s3 #17272

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e562ba
Add method to check if directory exists
kesselb Sep 28, 2018
c423cba
Rename $location to $path
kesselb Sep 29, 2018
b07fb56
Change visibility to private (from protected)
kesselb Sep 29, 2018
d7742c1
Fill directory cache from opendir
kesselb Jan 1, 2019
9bc0b06
Don't strip path from directory prefix
kesselb Feb 14, 2019
06be5b6
Use local variable for directory name
kesselb Mar 30, 2019
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
Change visibility to private (from protected) 
Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb
kesselb authored and Backportbot committed Sep 26, 2019
commit b07fb56ddc9998fad1e6ecbf0354ee0771965488
2 changes: 1 addition & 1 deletion 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 @@ -152,7 +152,7 @@ private function headObject($key) {
* @return bool
* @throws \Exception
*/
protected function doesDirectoryExist($path) {
private function doesDirectoryExist($path) {
if (!isset($this->directoryCache[$path])) {
// Maybe this isn't an actual key, but a prefix.
// Do a prefix listing of objects to determine.
Expand Down