Improve the way that hostname is obtained, should be safer in CLI scr…

…ipts, fixes PHPMailer#159
davidlfg · Dec 30, 2013 · 6767b0f · 6767b0f
1 parent 15f53e6
commit 6767b0f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -2717,14 +2717,14 @@ public static function rfcDate()
      */
     protected function serverHostname()
     {
+        $result = 'localhost.localdomain';
         if (!empty($this->Hostname)) {
             $result = $this->Hostname;
-        } elseif (isset($_SERVER['SERVER_NAME'])) {
+        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
-        } else {
-            $result = 'localhost.localdomain';
+        } elseif (gethostname() !== false) {
+            $result = gethostname();
         }
-
         return $result;
     }