diff options
| author | Andy Scherzinger <info@andy-scherzinger.de> | 2024-06-13 18:28:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 18:28:50 +0200 |
| commit | e1af6af627bf18620bcf49e599b12ade02103d25 (patch) | |
| tree | 7b6f17daca9acf7a5ba5775e697249750109aea1 | |
| parent | bdf8dc3737c93ff8d880b7e59bb1037866a06e91 (diff) | |
| parent | d285adee2a3e8782e671a55c7900462ee93d7201 (diff) | |
| download | nextcloud-server-e1af6af627bf18620bcf49e599b12ade02103d25.tar.gz nextcloud-server-e1af6af627bf18620bcf49e599b12ade02103d25.zip | |
Merge pull request #45839 from nextcloud/backport/45649/stable28
[stable28] 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 7aa4189bbde..19fcc5434a0 100644 --- a/lib/private/Files/ObjectStore/S3ConnectionTrait.php +++ b/lib/private/Files/ObjectStore/S3ConnectionTrait.php @@ -95,8 +95,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; } |