From 47fd3499a313b063406c35ba1ad65d2a77902148 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Mon, 11 Jun 2018 17:10:57 +0200
Subject: [PATCH] Fix listing s3 objects when using google cloud aws
 compatibility

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/private/Files/ObjectStore/S3ConnectionTrait.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php
index 9565a82ac3..feca792848 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;
 	}