Merge pull request #11721 from owncloud/fix-s3-regression

[master] Fix S3 connection regression
owncloud · Oct 23, 2014 · 7c14a17 · 7c14a17
2 parents ca01530 + 71dce48
commit 7c14a17
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
@@ -45,6 +45,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	 * @var array
 	 */
 	private static $tmpFiles = array();
+	/**
+	 * @var array
+	 */
+	private $params;
 	/**
 	 * @var bool
 	 */
@@ -101,7 +105,6 @@ public function __construct($params) {
 		$this->updateLegacyId($params);
 
 		$this->bucket = $params['bucket'];
-		$scheme = ($params['use_ssl'] === 'false') ? 'http' : 'https';
 		$this->test = isset($params['test']);
 		$this->timeout = (!isset($params['timeout'])) ? 15 : $params['timeout'];
 		$this->rescanDelay = (!isset($params['rescanDelay'])) ? 10 : $params['rescanDelay'];
@@ -110,7 +113,7 @@ public function __construct($params) {
 		if (!isset($params['port']) || $params['port'] === '') {
 			$params['port'] = ($params['use_ssl'] === 'false') ? 80 : 443;
 		}
-		$base_url = $scheme . '://' . $params['hostname'] . ':' . $params['port'] . '/';
+		$this->params = $params;
 	}
 
 	/**
@@ -550,11 +553,14 @@ public function getConnection() {
 			return $this->connection;
 		}
 
+		$scheme = ($this->params['use_ssl'] === 'false') ? 'http' : 'https';
+		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
+
 		$this->connection = S3Client::factory(array(
-			'key' => $params['key'],
-			'secret' => $params['secret'],
+			'key' => $this->params['key'],
+			'secret' => $this->params['secret'],
 			'base_url' => $base_url,
-			'region' => $params['region']
+			'region' => $this->params['region']
 		));
 
 		if (!$this->connection->isValidBucketName($this->bucket)) {