wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14211 from nextcloud/bugfix/prefix-path-to-filecache-s3

Browse source 
Prefix $path for filename for internal file cache
This commit is contained in:
Morris Jobke 2019-02-19 12:01:08 +01:00 committed by GitHub
commit 7fc68fe93e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_external/lib/Lib/Storage/AmazonS3.php
View file

@ -309,7 +309,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$files[] = $file;
// store this information for later usage
$this->filesCache[$file] = [
$this->filesCache[$path . $file] = [
'ContentLength' => $object['Size'],
'LastModified' => (string)$object['LastModified'],
];
@ -408,7 +408,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
try {
if ($this->headObject($path)) {
if (isset($this->filesCache[$path]) || $this->headObject($path)) {
return 'file';
}
if ($this->headObject($path . '/')) {