git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite; output changes resulting
[users/heiko/exim.git]
/
test
/
mail
/
0452.CALLER
diff --git
a/test/mail/0452.CALLER
b/test/mail/0452.CALLER
index 6c9f41736ad72fdcf26fe31350e043d0ab6c997a..a0aac71f92763a8fdbe3b22aab7ca23e4a915c0c 100644
(file)
--- a/
test/mail/0452.CALLER
+++ b/
test/mail/0452.CALLER
@@
-2,8
+2,6
@@
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
id 10HmaY-0005vi-00
for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
To: CALLER@test.ex
Subject: Auto generated
In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
To: CALLER@test.ex
Subject: Auto generated
In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
@@
-13,7
+11,9
@@
h1: the first added header
h2: the second added header
continued on another line
h3: the third added header
h2: the second added header
continued on another line
h3: the third added header
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@test.ex>
From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
This is some body text
This is some body text
@@
-21,13
+21,19
@@
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Received: from EXIMUSER by myhost.test.ex 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 myhost.test.ex 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@myhost.test.ex>
X-Failed-Recipients: userx@test.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: CALLER@test.ex
X-Failed-Recipients: userx@test.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@myhost.test.ex>
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
Subject: Mail delivery failed: returning message to sender
Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
This message was created automatically by mail delivery software.
This message was created automatically by mail delivery software.
@@
-37,17
+43,29
@@
recipients. This is a permanent error. The following address(es) failed:
userx@test.ex
retry timeout exceeded
userx@test.ex
retry timeout exceeded
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
Return-path: <CALLER@test.ex>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaZ-0005vi-00
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
Return-path: <CALLER@test.ex>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaZ-0005vi-00
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
fno: 2
fno: 2
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@test.ex>
From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
Another message
Another message
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+