diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2020-06-17 10:58:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 10:58:27 +0200 |
| commit | 6328053105d7c0d6d3487560effc5179f2f58a46 (patch) | |
| tree | 716636f08c66182509207ed1d69b74c9627809c2 /lib/private | |
| parent | c1183fa7581b4e1c3300e773dc46a70f46722aee (diff) | |
| parent | 9d392891beb545a2c8177edb7b420bb3c155d84f (diff) | |
| download | nextcloud-server-6328053105d7c0d6d3487560effc5179f2f58a46.tar.gz nextcloud-server-6328053105d7c0d6d3487560effc5179f2f58a46.zip | |
Merge pull request #21406 from nextcloud/fix/aws-disable-csm
Disable Client-Side Monitoring on AWS storage
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index 0208df1908a..16a48ee82a0 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -47,7 +47,7 @@ trait S3ConnectionTrait { /** @var int */ protected $timeout; - + /** @var int */ protected $uploadPartSize; @@ -99,7 +99,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']]; |