diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-06-12 22:56:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 22:56:36 +0200 |
| commit | b3e4270135d5de64b2b4d43b3d08f00c91b7beab (patch) | |
| tree | 76d5ed1a05dde2fd893281ceb56be937b259d1a5 | |
| parent | 709347273a1a492ca73002d1148af46a694be8ca (diff) | |
| parent | 63886147bac7bc5fded32dba02ddc72db416babf (diff) | |
| download | nextcloud-server-b3e4270135d5de64b2b4d43b3d08f00c91b7beab.tar.gz nextcloud-server-b3e4270135d5de64b2b4d43b3d08f00c91b7beab.zip | |
Merge pull request #45649 from nextcloud/jtr/fix-oo-s3-no-hostname
fix(ObjectStore): Fix regression when hostname is empty
| -rw-r--r-- | lib/private/Files/ObjectStore/S3ConnectionTrait.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/ObjectStore/S3ConnectionTrait.php b/lib/private/Files/ObjectStore/S3ConnectionTrait.php index 02f5e5ded04..c7a5a8a1add 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -44,8 +44,8 @@ trait S3ConnectionTrait { $this->copySizeLimit = $params['copySizeLimit'] ?? 5242880000; $this->useMultipartCopy = (bool)($params['useMultipartCopy'] ?? true); $params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region']; - $params['s3-accelerate'] = $params['hostname'] == 's3-accelerate.amazonaws.com' || $params['hostname'] == 's3-accelerate.dualstack.amazonaws.com'; $params['hostname'] = empty($params['hostname']) ? 's3.' . $params['region'] . '.amazonaws.com' : $params['hostname']; + $params['s3-accelerate'] = $params['hostname'] === 's3-accelerate.amazonaws.com' || $params['hostname'] === 's3-accelerate.dualstack.amazonaws.com'; if (!isset($params['port']) || $params['port'] === '') { $params['port'] = (isset($params['use_ssl']) && $params['use_ssl'] === false) ? 80 : 443; } |