From a666f804c76c90c19e6c27637642b7b4b9418d56 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 18 Feb 2015 13:59:37 +0100
Subject: [PATCH] Use the untrusted domain in the installer

---
 lib/private/setup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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()),
 		]);
-- 
2.39.5