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

[12] Fix s3 download and touch
nextcloud · Nov 17, 2017 · 031bde5 · 031bde5
2 parents 9942c39 + e041c7a
commit 031bde5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -364,7 +364,7 @@ public function touch($path, $mtime = null) {
 			$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 @@ public function writeBack($tmpFile, $path) {
 		$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
@@ -50,9 +50,15 @@ function readObject($urn) {
 			'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
 			]
 		];