Merge pull request #7113 from nextcloud/s3-download-stream-fix

Fix s3 download and touch

2 files changed, 9 insertions, 3 deletions

diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
index 15df808684b..79ce7ee3247 100644
--- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php
+++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -364,7 +364,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 			$fileId = $this->getCache()->put($path, $stat);
 			try {
 				//read an empty file from memory
-				$this->objectStore->writeObject($this->getURN($fileId), fopen('php://memory', 'r'));
+				$this->file_put_contents($path, ' ');
 			} catch (\Exception $ex) {
 				$this->getCache()->remove($path);
 				$this->logger->logException($ex, [
@@ -392,7 +392,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 		$stat['storage_mtime'] = $mTime;
 
 		// run path based detection first, to use file extension because $tmpFile is only a random string
-		$mimetypeDetector =  \OC::$server->getMimeTypeDetector();
+		$mimetypeDetector = \OC::$server->getMimeTypeDetector();
 		$mimetype = $mimetypeDetector->detectPath($path);
 		if ($mimetype === 'application/octet-stream') {
 			$mimetype = $mimetypeDetector->detect($tmpFile);
diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
index b418219c29b..9c5cf9ccc6c 100644
--- a/lib/private/Files/ObjectStore/S3ObjectTrait.php
+++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -52,9 +52,15 @@ trait S3ObjectTrait {
 			'Key' => $urn
 		]);
 		$request = \Aws\serialize($command);
+		$headers = [];
+		foreach ($request->getHeaders() as $key => $values) {
+			foreach ($values as $value) {
+				$headers[] = "$key: $value";
+			}
+		}
 		$opts = [
 			'http' => [
-				'header' => $request->getHeaders()
+				'header' => $headers
 			]
 		];