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
Delivery: quieten smtp transport conn reuse vs. delivery race. Bug 1810
[users/heiko/exim.git]
/
test
/
mail
/
0280.CALLER
diff --git
a/test/mail/0280.CALLER
b/test/mail/0280.CALLER
index 76002d9716d12b5cb0986479118cc96fd6b13776..4de58ff3fdb49bc3e0f6106cbd33d22bd5d12055 100644
(file)
--- a/
test/mail/0280.CALLER
+++ b/
test/mail/0280.CALLER
@@
-5,10
+5,15
@@
X-Failed-Recipients: spqr@test.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: spqr@test.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: spqr@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
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Subject: Mail delivery failed: returning message to sender
Message-Id: <E10HmaY-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.
A message that you sent could not be delivered to one or more of its
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
@@
-17,7
+22,17
@@
recipients. This is a permanent error. The following address(es) failed:
spqr@test.ex
Unrouteable address
spqr@test.ex
Unrouteable address
------- 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;spqr@test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
Return-path: <spqr@test.ex>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Return-path: <spqr@test.ex>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-29,6
+44,8
@@
From: spqr@test.ex
Date: Tue, 2 Mar 1999 09:44:33 +0000
Date: Tue, 2 Mar 1999 09:44:33 +0000
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
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; Tue, 2 Mar 1999 09:44:33 +0000
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; Tue, 2 Mar 1999 09:44:33 +0000
@@
-36,10
+53,15
@@
X-Failed-Recipients: abcd@test.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: abcd@test.ex
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@test.ex>
To: abcd@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
Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
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.
A message that you sent could not be delivered to one or more of its
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
@@
-48,7
+70,17
@@
recipients. This is a permanent error. The following address(es) failed:
abcd@test.ex
Unrouteable address
abcd@test.ex
Unrouteable address
------- 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;abcd@test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
Return-path: <abcd@test.ex>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Return-path: <abcd@test.ex>
Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@
-60,3
+92,5
@@
From: abcd@test.ex
Date: Tue, 2 Mar 1999 09:44:33 +0000
Date: Tue, 2 Mar 1999 09:44:33 +0000
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+