X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=class%2Fdeliver%2FDeliver.class.php;h=ddb3436c9255139f1a445fb9c772104362916a2f;hp=59312ebf5802fd1e99ae9b3f34cda8095d8900fc;hb=49c392c22f010d0c286c8e32131bc7e4d2127623;hpb=8a1f4ae33ef455ca96db65489f8f5219c87b4daa

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index 59312ebf..ddb3436c 100644
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -496,7 +496,8 @@ class Deliver {
         /* This creates an RFC 822 date */
         $date = date('D, j M Y H:i:s ', time()) . $this->timezone();
         /* Create a message-id */
-        $message_id = '<' . $REMOTE_PORT . '.';
+        $message_id = '<' . (!empty($REMOTE_PORT) ? $REMOTE_PORT . '.' : '');
+//FIXME: if $REMOTE_ADDR is missing, should we skip this if/else block?  or perhaps try to generate it with some different kind of info?
         if (isset($encode_header_key) && trim($encode_header_key)!='') {
             // use encrypted form of remote address
             $message_id.= OneTimePadEncrypt($this->ip2hex($REMOTE_ADDR),base64_encode($encode_header_key));