Make smtp_receive_timeout main option expanded. Bug 564

[users/jgh/exim.git] / test / mail / 0452.CALLER

diff --git a/test/mail/0452.CALLER b/test/mail/0452.CALLER
index 27ea508a1761001eb43f13b6ce0690533cca9795..bda53558eb01a82d44a22fc5cd9b30cedc1e0e99 100644 (file)
--- a/test/mail/0452.CALLER
+++ b/test/mail/0452.CALLER
@@ -5,6 +5,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 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>

+References: <E10HmaX-0005vi-00@myhost.test.ex>

 Auto-Submitted: auto-replied
 h1: the first added header
 h2: the second added header
 Auto-Submitted: auto-replied
 h1: the first added header
 h2: the second added header


@@ -24,10 +25,15 @@ X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@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


@@ -36,7 +42,17 @@ 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)
 
 Return-path: <CALLER@test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)


@@ -50,3 +66,5 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another message 
 
 
 Another message 
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+