Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-12-03 21:54:48 +0300
committerLukas Reschke <lukas@owncloud.com>2014-12-05 13:28:56 +0300
commitbe26cccd8aa5a6e2eb97fb6d94bd20bda1e2e135 (patch)
tree50c843012d4cb0eea48ee4c01b8ac0fe8cd2a39c /lib/private/setup.php
parent71bd33da98b4f3a12bfda59a836c89500b262840 (diff)
Trim port from domain
Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500) To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)
Diffstat (limited to 'lib/private/setup.php')
-rw-r--r--lib/private/setup.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/setup.php b/lib/private/setup.php
index a18c72db334..a958aba3117 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -166,7 +166,7 @@ class OC_Setup {
&& is_array($options['trusted_domains'])) {
$trustedDomains = $options['trusted_domains'];
} else {
- $trustedDomains = array(OC_Request::serverHost());
+ $trustedDomains = array(\OC_Request::getDomainWithoutPort(\OC_Request::serverHost()));
}
if (OC_Util::runningOnWindows()) {