diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-06-12 10:39:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 10:39:28 +0200 |
| commit | dbd4da2e91f363f5720b24feeaeccc14b3350cd5 (patch) | |
| tree | beebe9b6bd4f6a977f87edc6f2f26876fbd9f01a /lib | |
| parent | d91bed949063a489e497962fec60d5cd3ba0f58d (diff) | |
| parent | 47fd3499a313b063406c35ba1ad65d2a77902148 (diff) | |
| download | nextcloud-server-dbd4da2e91f363f5720b24feeaeccc14b3350cd5.tar.gz nextcloud-server-dbd4da2e91f363f5720b24feeaeccc14b3350cd5.zip | |
Merge pull request #9828 from nextcloud/gc-s3-list
Fix listing s3 objects when using google cloud aws compatibility
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index 9565a82ac31..feca792848e 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -121,6 +121,11 @@ trait S3ConnectionTrait { } } + // google cloud's s3 compatibility doesn't like the EncodingType parameter + if (strpos($base_url, 'storage.googleapis.com')) { + $this->connection->getHandlerList()->remove('s3.auto_encode'); + } + return $this->connection; } |