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

fix(proxy): reaching s3 storage behind some http proxy 

Signed-off-by: Maxime Besson <maxime.besson@worteks.com>
This commit is contained in:
Maxime Besson 2021-04-08 18:00:12 +02:00
parent 03fe74b95e
commit 547438527d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,8 +51,7 @@ trait S3ObjectTrait {
*/
public function readObject($urn) {
return SeekableHttpStream::open(function ($range) use ($urn) {
$connection = $this->getConnection();
$command = $connection->getCommand('GetObject', [
$command = $this->getConnection()->getCommand('GetObject', [
'Bucket' => $this->bucket,
'Key' => $urn,
'Range' => 'bytes=' . $range,
@ -71,8 +70,9 @@ trait S3ObjectTrait {
],
];
if ($connection->getProxy()) {
$opts['http']['proxy'] = $connection->getProxy();
if ($this->getProxy()) {
$opts['http']['proxy'] = $this->getProxy();
$opts['http']['request_fulluri'] = true;
}
$context = stream_context_create($opts);