summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-02-06 13:50:10 +0100
committerAndrey Andreev <narf@devilix.net>2015-02-06 13:50:10 +0100
commit396eb89d1624f0bad6bc41ee477f40e824be41d9 (patch)
tree8a2caafad2b8822b2bfe6c017fba7d5b7ac5f4c2 /system/libraries
parentacfc10868d417c49370ce0bfab977445d2590e1c (diff)
Polish changes following PR #3573
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Email.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 43dbe28b4..45c5c09b9 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -2171,16 +2171,23 @@ class CI_Email {
/**
* Get Hostname
- *
- * There are only two legal types of hostname either a fully qualified domain
- * name (eg: "mail.example.com") or an "IP literal" (eg: "[1.2.3.4]").
- *
+ *
+ * There are only two legal types of hostname - either a fully
+ * qualified domain name (eg: "mail.example.com") or an IP literal
+ * (eg: "[1.2.3.4]").
+ *
+ * @link https://tools.ietf.org/html/rfc5321#section-2.3.5
* @link http://cbl.abuseat.org/namingproblems.html
* @return string
*/
protected function _get_hostname()
{
- return isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '[' . $_SERVER['SERVER_ADDR'] . ']';
+ if (isset($_SERVER['SERVER_NAME']))
+ {
+ return $_SERVER['SERVER_NAME'];
+ }
+
+ return isset($_SERVER['SERVER_ADDR']) ? '['.$_SERVER['SERVER_ADDR'].']' : '[127.0.0.1]';
}
// --------------------------------------------------------------------