git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix "-bP smtp_receive_timeout". Bug 2384
[exim.git] / test / mail / 0194.CALLER
diff --git a/test/mail/0194.CALLER b/test/mail/0194.CALLER
index 0a28b3f0e7b77c19ec46c7c1e728e9dfe6a2e73a..41420fb84e0e9be8c5f8a06d5d560425b00b52ea 100644 (file)
--- a/test/mail/0194.CALLER
+++ b/test/mail/0194.CALLER
@@ -8,10 +8,15 @@ X-Failed-Recipients: userz@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@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
 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
@@ -29,7 +34,25 @@ The following text was generated during the delivery attempts:
 
 This is some returned text.
 
------- 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;userz@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;usery@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;userx@myhost.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -41,6 +64,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
+--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
@@ -55,10 +80,15 @@ X-Failed-Recipients: seven@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@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
 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
@@ -90,7 +120,41 @@ This is some returned text.
 
 This is some returned text.
 
------- 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;three@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;two@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;one@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;six@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;five@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;four@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;seven@myhost.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -102,6 +166,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here's another message.
 
+--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 10HmbD-0005vi-00
@@ -112,10 +178,15 @@ X-Failed-Recipients: userz@myhost.test.ex,
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@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
 Message-Id: <E10HmbD-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
@@ -136,7 +207,25 @@ The following text was generated during the delivery attempts:
 
 This script generates this message and returns the value of its argument.
 
------- 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;userz@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;usery@myhost.test.ex
+Status: 5.0.0
+
+Action: failed
+Final-Recipient: rfc822;userx@myhost.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
@@ -149,3 +238,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 More message 99
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
Master Exim source repository