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

Merge pull request #27097 from nextcloud/backport/27040/stable21 

[stable21] Avoid reading ~/.aws/config when using S3 provider
This commit is contained in:
Morris Jobke 2021-05-25 16:31:29 +02:00 committed by GitHub
parent 885b0b3dbf ede67149ea
commit 6814ac03c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/private/Files/ObjectStore/S3ConnectionTrait.php
View File

@ -121,6 +121,7 @@ trait S3ConnectionTrait {
'use_path_style_endpoint' => isset($this->params['use_path_style']) ? $this->params['use_path_style'] : false, 'use_path_style_endpoint' => isset($this->params['use_path_style']) ? $this->params['use_path_style'] : false,
'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()), 'signature_provider' => \Aws\or_chain([self::class, 'legacySignatureProvider'], ClientResolver::_default_signature_provider()),
'csm' => false, 'csm' => false,
'use_arn_region' => false,
]; ];
if (isset($this->params['proxy'])) { if (isset($this->params['proxy'])) {
$options['request.options'] = ['proxy' => $this->params['proxy']]; $options['request.options'] = ['proxy' => $this->params['proxy']];