diff options
| author | Clark Tomlinson <fallen013@gmail.com> | 2015-02-18 09:40:32 -0500 |
|---|---|---|
| committer | Clark Tomlinson <fallen013@gmail.com> | 2015-02-18 09:40:32 -0500 |
| commit | c4fdb9cc241e862afd45e1d4cd4fd4c2216002d1 (patch) | |
| tree | 47edb47a1f75429c47d1795fa3f603d1d942b1e8 | |
| parent | 610761d1f735b78cec2025f04a705d3bff181433 (diff) | |
| parent | a666f804c76c90c19e6c27637642b7b4b9418d56 (diff) | |
| download | nextcloud-server-c4fdb9cc241e862afd45e1d4cd4fd4c2216002d1.tar.gz nextcloud-server-c4fdb9cc241e862afd45e1d4cd4fd4c2216002d1.zip | |
Merge pull request #14324 from owncloud/fix/14320
Check if instance is not yet installed
| -rw-r--r-- | lib/base.php | 1 | ||||
| -rw-r--r-- | lib/private/setup.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index cdc662c28d9..93f7a2a9b21 100644 --- a/lib/base.php +++ b/lib/base.php @@ -637,6 +637,7 @@ class OC { // \OC\AppFramework\Http\Request::getOverwriteHost public && self::$server->getConfig()->getSystemValue('overwritehost') === '' && !\OC::$server->getTrustedDomainHelper()->isTrustedDomain($host) + && self::$server->getConfig()->getSystemValue('installed', false) ) { header('HTTP/1.1 400 Bad Request'); header('Status: 400 Bad Request'); diff --git a/lib/private/setup.php b/lib/private/setup.php index a3b46c1eb4f..ede3a452c29 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -164,7 +164,7 @@ class OC_Setup { && is_array($options['trusted_domains'])) { $trustedDomains = $options['trusted_domains']; } else { - $trustedDomains = [\OCP\Util::getServerHostName()]; + $trustedDomains = [$request->getInsecureServerHost()]; } if (OC_Util::runningOnWindows()) { @@ -187,7 +187,7 @@ class OC_Setup { 'secret' => $secret, 'trusted_domains' => $trustedDomains, 'datadirectory' => $dataDir, - 'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getServerHost() . OC::$WEBROOT, + 'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . OC::$WEBROOT, 'dbtype' => $dbType, 'version' => implode('.', OC_Util::getVersion()), ]); |