summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-06-22 16:28:59 +0200
committerGitHub <noreply@github.com>2020-06-22 16:28:59 +0200
commit779f45de9cd58d2b40486495fba26e282d50570e (patch)
tree0bd800f4f05ba7a9407a01e58b39b58fb6c2c1ed /lib/private
parenta367147d8e3821086d2efe42ca2caa517b29ba7f (diff)
parent5fdcb5a1e3772d43f5b59a3486eee98841f66f30 (diff)
downloadnextcloud-server-779f45de9cd58d2b40486495fba26e282d50570e.tar.gz
nextcloud-server-779f45de9cd58d2b40486495fba26e282d50570e.zip
Merge pull request #21448 from nextcloud/backport/21406/stable18
[stable18] Disable Client-Side Monitoring on AWS storage
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Files/ObjectStore/S3ConnectionTrait.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index f931b6092a6..6d48f20ac4a 100644
--- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php
+++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
@@ -94,7 +94,8 @@ trait S3ConnectionTrait {
'endpoint' => $base_url,
'region' => $this->params['region'],
'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,
];
if (isset($this->params['proxy'])) {
$options['request.options'] = ['proxy' => $this->params['proxy']];