From 485e1181a3204e9f82d9b021926ed56b9c7aa11a Mon Sep 17 00:00:00 2001 From: kink Date: Wed, 11 Aug 2004 11:03:37 +0000 Subject: [PATCH] It seems more logical to use the SERVER_NAME as the RHS of the Message-ID than to use the remote host from which the user is connecting. Even more since the REMOTE_ADDR is already contained within the Message-ID. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7883 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- class/deliver/Deliver.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php index 55c6a959..6adaf3da 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@' . (isset($REMOTE_HOST) ? $REMOTE_HOST : "[$REMOTE_ADDR]") .'>'; + $message_id .= time() . '.squirrel@' . $SERVER_NAME .'>'; /* Make an RFC822 Received: line */ if (isset($REMOTE_HOST)) { $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])"; -- 2.25.1