summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2021-05-25 10:19:22 +0200
committerGitHub <noreply@github.com>2021-05-25 10:19:22 +0200
commit333665b43d79aa5a83d112748583c1a59cc76a5b (patch)
treeef4bbd9985290547ca88891db80886eb4b072fb2 /lib
parent3fa2437223ac44aa2fa8e74485490392658d7d75 (diff)
parentd4444f247234fe026e591ec93a38c30ce3219ed9 (diff)
downloadnextcloud-server-333665b43d79aa5a83d112748583c1a59cc76a5b.tar.gz
nextcloud-server-333665b43d79aa5a83d112748583c1a59cc76a5b.zip
Merge pull request #27040 from nextcloud/FlorentCoppint-master
Avoid reading ~/.aws/config when using S3 provider
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/ObjectStore/S3ConnectionTrait.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index d88ef0ac8e7..9e0b12ec177 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -121,6 +121,7 @@ trait S3ConnectionTrait {
'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()),
'csm' => false,
+ 'use_arn_region' => false,
];
if (isset($this->params['proxy'])) {
$options['request.options'] = ['proxy' => $this->params['proxy']];