]> source.dussan.org Git - nextcloud-server.git/commitdiff
use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 1 Jul 2013 21:51:43 +0000 (23:51 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 1 Jul 2013 21:51:43 +0000 (23:51 +0200)
lib/request.php

index aa5f53c08eb62bb380760e1e465a06789ed54a8e..df33217f95d65bde3bcddc1af2e0e37ea5e78816 100755 (executable)
@@ -9,7 +9,7 @@
 class OC_Request {
        /**
         * @brief Check overwrite condition
-        * @returns true/false
+        * @returns bool
         */
        private static function isOverwriteCondition($type = '') {
                $regex = '/' . OC_Config::getValue('overwritecondaddr', '')  . '/';
@@ -40,7 +40,13 @@ class OC_Request {
                        }
                }
                else{
-                       $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
+                       if (isset($_SERVER['HTTP_HOST'])) {
+                               return $_SERVER['HTTP_HOST'];
+                       }
+                       if (isset($_SERVER['SERVER_NAME'])) {
+                               return $_SERVER['SERVER_NAME'];
+                       }
+                       return 'localhost';
                }
                return $host;
        }