From d248a6166d0406cab6decd1443e91476bdba67fa Mon Sep 17 00:00:00 2001 From: kink Date: Tue, 3 Aug 2004 11:29:07 +0000 Subject: [PATCH] If we use the IP as the RHS of the Message-ID, we need to enclose it in brackets (RFC 822). And if we have the hostname available, we might as well use that. Spotted by Andreas M. Kirchwitz, closes #1001295 git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7821 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- ChangeLog | 1 + class/deliver/Deliver.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee7291b1..6140c064 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ Version 1.5.1 -- CVS Bieliauskas for spotting big signature "option". - Make SquirrelSpell work with safe_mode enabled, if using PHP >=4.3.0. Patch by Ray Ferguson. + - Make IP-address in Message-ID RFC822 compliant. Version 1.5.0 -------------------- diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php index 81b04b0c..55c6a959 100644 --- a/class/deliver/Deliver.class.php +++ b/class/deliver/Deliver.class.php @@ -379,7 +379,7 @@ class Deliver { $date = date('D, j M Y H:i:s ', mktime()) . $this->timezone(); /* Create a message-id */ $message_id = '<' . $REMOTE_PORT . '.' . $REMOTE_ADDR . '.'; - $message_id .= time() . '.squirrel@' . $REMOTE_ADDR .'>'; + $message_id .= time() . '.squirrel@' . (isset($REMOTE_HOST) ? $REMOTE_HOST : "[$REMOTE_ADDR]") .'>'; /* Make an RFC822 Received: line */ if (isset($REMOTE_HOST)) { $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])"; -- 2.25.1