diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-10-23 12:36:35 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-10-23 12:36:35 +0200 |
| commit | a3c33585e13bf6e9bc8c93baa156a5dbe4d6a4a6 (patch) | |
| tree | 4c0153b286ad14c8901a525069a6966ed908c41c | |
| parent | 33999303551c11ea4a01d642900fc7213fe6e615 (diff) | |
| parent | 6a8c41754fdcd4dee747b92406aca0798c41dc7a (diff) | |
| download | nextcloud-server-a3c33585e13bf6e9bc8c93baa156a5dbe4d6a4a6.tar.gz nextcloud-server-a3c33585e13bf6e9bc8c93baa156a5dbe4d6a4a6.zip | |
Merge pull request #11719 from owncloud/stable7-fix-s3-regression
[stable7] Fix S3 connection regression
| -rw-r--r-- | apps/files_external/lib/amazons3.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index c73860d99a8..77c5f82d539 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -46,6 +46,10 @@ class AmazonS3 extends \OC\Files\Storage\Common { */ private static $tmpFiles = array(); /** + * @var array + */ + private $params; + /** * @var bool */ private $test = false; @@ -101,7 +105,6 @@ class AmazonS3 extends \OC\Files\Storage\Common { $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 @@ class AmazonS3 extends \OC\Files\Storage\Common { if (!isset($params['port']) || $params['port'] === '') { $params['port'] = ($params['use_ssl'] === 'false') ? 80 : 443; } - $base_url = $scheme . '://' . $params['hostname'] . ':' . $params['port'] . '/'; + $this->params = $params; } /** @@ -548,11 +551,14 @@ class AmazonS3 extends \OC\Files\Storage\Common { 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)) { |