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

Merge pull request #21447 from nextcloud/backport/21406/stable19 

[stable19] Disable Client-Side Monitoring on AWS storage
This commit is contained in:
Roeland Jago Douma 2020-06-22 16:29:05 +02:00 committed by GitHub
parent d1c19fbe23 60a3bf8572
commit 286f79c388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ trait S3ConnectionTrait {
/** @var int */ /** @var int */
protected $timeout; protected $timeout;
/** @var int */ /** @var int */
protected $uploadPartSize; protected $uploadPartSize;
@ -99,7 +99,8 @@ trait S3ConnectionTrait {
'endpoint' => $base_url, 'endpoint' => $base_url,
'region' => $this->params['region'], 'region' => $this->params['region'],
'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,
]; ];
if (isset($this->params['proxy'])) { if (isset($this->params['proxy'])) {
$options['request.options'] = ['proxy' => $this->params['proxy']]; $options['request.options'] = ['proxy' => $this->params['proxy']];