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:
authorVincent Petry <pvince81@owncloud.com>2014-02-25 15:32:36 +0400
committerVincent Petry <pvince81@owncloud.com>2014-02-25 15:32:36 +0400
commit0be942635dc8ea7ac5b8d85ef33d675d50aaa016 (patch)
treed07153fc40df1c49bd0cea0f7c67e44ae62eebe5
parent3730875b2f01cd36b45c50daa81ba2a8bd6f8ce6 (diff)
parent153fde697fce8ac605bbc3f2cd9b2bb349bd2d25 (diff)
Merge pull request #7387 from owncloud/stable5-fixhostnamewithport
Fix case where port is missing
-rwxr-xr-xlib/request.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/request.php b/lib/request.php
index 2a7101efbe1..d83e432866c 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -52,7 +52,7 @@ class OC_Request {
if (isset($_SERVER['HTTP_HOST'])) {
$host = $_SERVER['HTTP_HOST'];
}
- if (isset($_SERVER['SERVER_NAME'])) {
+ else if (isset($_SERVER['SERVER_NAME'])) {
$host = $_SERVER['SERVER_NAME'];
}
}