Ensure lookup-result variables are dropped between messages on a connection

[users/heiko/exim.git] / test / mail / 0522.CALLER

diff --git a/test/mail/0522.CALLER b/test/mail/0522.CALLER
index 09386c45644ab313e0ae8c28e0260a85cf4d3b7b..867dea8971dae5c2eb00072f671a87f8181bd764 100644 (file)
--- a/test/mail/0522.CALLER
+++ b/test/mail/0522.CALLER
@@ -6,10 +6,16 @@ X-Failed-Recipients: nofilter@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

+References: <E10HmaX-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
 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


@@ -18,7 +24,17 @@ recipients. This is a permanent error. The following address(es) failed:
   nofilter@test.ex
     local delivery failed
 
   nofilter@test.ex
     local delivery failed
 

------- 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;nofilter@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)


@@ -30,6 +46,8 @@ From: CALLER_NAME <CALLER@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
 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


@@ -38,10 +56,16 @@ X-Failed-Recipients: filter@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

+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
 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


@@ -50,7 +74,17 @@ recipients. This is a permanent error. The following address(es) failed:
   filter@test.ex
     local delivery failed
 
   filter@test.ex
     local delivery failed
 

------- 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;filter@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)


@@ -62,3 +96,5 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+