summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-13 11:15:47 +0100
committerLukas Reschke <lukas@owncloud.com>2014-11-18 12:36:03 +0100
commitd0a30b0e55799e8f5348ee558346d6ebf32cedda (patch)
treea5e9d1f4980f66b7e8923f08a870b663c921f5aa /config
parent230e517f3506624091d19194ce17d43c3f105c88 (diff)
downloadnextcloud-server-d0a30b0e55799e8f5348ee558346d6ebf32cedda.tar.gz
nextcloud-server-d0a30b0e55799e8f5348ee558346d6ebf32cedda.zip
Ignore port for trusted domains
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975. Conflicts: lib/private/request.php
Diffstat (limited to 'config')
-rw-r--r--config/config.sample.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index daca5aed362..2287b7af7dd 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -71,7 +71,7 @@ $CONFIG = array(
'trusted_domains' =>
array (
'demo.example.org',
- 'otherdomain.example.org:8080',
+ 'otherdomain.example.org',
),