summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2018-06-11 17:10:57 +0200
committerRobin Appelman <robin@icewind.nl>2018-06-11 17:10:57 +0200
commit47fd3499a313b063406c35ba1ad65d2a77902148 (patch)
tree493ad4bfeb1add396cfea4081161c2e6745aa939 /lib
parentc923ee7419035e26682df4c0dbf951822860249d (diff)
downloadnextcloud-server-47fd3499a313b063406c35ba1ad65d2a77902148.tar.gz
nextcloud-server-47fd3499a313b063406c35ba1ad65d2a77902148.zip
Fix listing s3 objects when using google cloud aws compatibility
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/ObjectStore/S3ConnectionTrait.php5
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;
}