two more header order changes

diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index 7ec707e8e7b9aa8b55d43e72c13fac604038a5ca..a2dea13eb09ae1f323af4b1e2e556f7f92dca6a6 100644 (file)
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

 X-Failed-Recipients: bounce@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: bounce@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender

+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -30,10 +30,10 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000

-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 Subject: first message
 Subject: first message

+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999


@@ -43,20 +43,20 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes

+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
 The message identifier is:     10HmaZ-0005vi-00
 
 This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
 The message identifier is:     10HmaZ-0005vi-00

-The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000

 The subject of the message is: second message
 The subject of the message is: second message

+The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000

 
 The addresses to which the message has not yet been delivered are:
 
 
 The addresses to which the message has not yet been delivered are:
 

diff --git a/test/stdout/0542 b/test/stdout/0542
index 6a860f0d96413c88854f433033474af754b49756..ab29dc9c0cff36a3e81061c475e52127a06f60b4 100644 (file)
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -30,11 +30,11 @@
 > message_body_linecount=2
 > max_received_linelength=50
 > headers -----------------
 > message_body_linecount=2
 > max_received_linelength=50
 > headers -----------------

-> Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-From: A Person <a.person@a.domain.tld>
+> From: A Person <a.person@a.domain.tld>

 To: First <first@test.ex>, Second <second@test.ex>
 Subject: The subject is moot
 To: First <first@test.ex>, Second <second@test.ex>
 Subject: The subject is moot

+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 > 
 > body --------------------
 > And now we have the body of the message, containing a small number of lines. 
 > 
 > body --------------------
 > And now we have the body of the message, containing a small number of lines.