Skip to content

Commit

Permalink
Merge pull request #21447 from nextcloud/backport/21406/stable19
Browse files Browse the repository at this point in the history
[stable19] Disable Client-Side Monitoring on AWS storage
  • Loading branch information
rullzer authored Jun 22, 2020
2 parents d1c19fb + 60a3bf8 commit 286f79c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/private/Files/ObjectStore/S3ConnectionTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ trait S3ConnectionTrait {

/** @var int */
protected $timeout;

/** @var int */
protected $uploadPartSize;

Expand Down Expand Up @@ -99,7 +99,8 @@ public function getConnection() {
'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']];
Expand Down

0 comments on commit 286f79c

Please sign in to comment.