mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6975 from nextcloud/s3-read-object-fopen 

use fopen directly when reading objects from s3
This commit is contained in:
Joas Schilling 2017-11-01 10:57:56 +01:00 committed by GitHub
parent 3d0eebf936 f9a7294807
commit defc4bf6a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/Files/ObjectStore/S3ObjectTrait.php
View File

@ -49,12 +49,15 @@ trait S3ObjectTrait {
'Bucket' => $this->bucket,
'Key' => $urn
]);
$command['@http']['stream'] = true;
$result = $client->execute($command);
/** @var StreamInterface $body */
$body = $result['Body'];
$request = \Aws\serialize($command);
$opts = [
'http' => [
'header' => $request->getHeaders()
]
];
return $body->detach();
$context = stream_context_create($opts);
return fopen($request->getUri(), 'r', false, $context);
}
/**