Merge pull request PHPMailer#185 from ojovirtual/patch-1

Update class.phpmailer.php
ffilee · Feb 14, 2014 · 56842bf · 56842bf
2 parents 338dd08 + 8a46f63
commit 56842bf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -2730,8 +2730,10 @@ protected function serverHostname()
             $result = $this->Hostname;
         } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
             $result = $_SERVER['SERVER_NAME'];
-        } elseif (gethostname() !== false) {
+        } elseif (function_exists("gethostname") && gethostname() !== false) {
             $result = gethostname();
+        }elseif (php_uname("n") !== false){
+            $result = php_uname("n");
         }
         return $result;
     }