SRS: avoid expanding ${srs_encode...} when guarded by ${if...}

[exim.git] / test / mail / 0220.userx

diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 0eadbaa4162868ff2121aa17993a252cf18641b4..e8662a6244d14b23a4fcd40d7b6899eebd6a68b6 100644 (file)
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -2,7 +2,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmaY-0005vi-00
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmaY-0005vi-00

-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>


@@ -13,7 +14,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmaZ-0005vi-00
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmaZ-0005vi-00

-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>


@@ -21,10 +23,12 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
 
 
 From foo@bar Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <foo@bar>)
        id 10HmbA-0005vi-00
        (envelope-from <foo@bar>)
        id 10HmbA-0005vi-00

-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>


@@ -35,7 +39,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmbB-0005vi-00
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmbB-0005vi-00

-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 From: foobydooby <foo@bar>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 From: foobydooby <foo@bar>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>


@@ -46,7 +51,8 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00

-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000