git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
SOCKS: support option expansion result for no-proxy. Bug 3118
[exim.git] / test / stdout / 4714
diff --git a/test/stdout/4714 b/test/stdout/4714
index 207e19a4f27fd1bbf8baaedfebf88ab26087ad75..c6016beda5a6bb511d2371b8e09286cb80e7f6fe 100644 (file)
--- a/test/stdout/4714
+++ b/test/stdout/4714
@@ -14,10 +14,10 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmaX-0005vi-00;
+       id 10HmaX-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
 Subject: message 1
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -31,10 +31,10 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmaX-0005vi-00;
+       id 10HmaX-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
 Subject: message 1
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -42,16 +42,16 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 250 message 2 received
 MAIL FROM:<CALLER@the.local.host.name>
 250 mail cmd 3 good
-RCPT TO:<r3_1.test.ex@the.local.host.name>
+RCPT TO:<r2_1.test.ex@the.local.host.name>
 250 rcpt cmd good
 DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmaZ-0005vi-00;
+       id 10HmaY-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
-Subject: message 3
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Subject: message 2
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -59,16 +59,16 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 250 message 3 received
 MAIL FROM:<CALLER@the.local.host.name>
 250 mail cmd 4 good
-RCPT TO:<r3_2.test.ex@the.local.host.name>
+RCPT TO:<r2_2.test.ex@the.local.host.name>
 250 rcpt cmd good
 DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmaZ-0005vi-00;
+       id 10HmaY-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
-Subject: message 3
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Subject: message 2
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -76,16 +76,16 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 250 message 4 received
 MAIL FROM:<CALLER@the.local.host.name>
 250 mail cmd 5 good
-RCPT TO:<r2_1.test.ex@the.local.host.name>
+RCPT TO:<r3_1.test.ex@the.local.host.name>
 250 rcpt cmd good
 DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmaY-0005vi-00;
+       id 10HmaZ-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
-Subject: message 2
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Subject: message 3
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -99,24 +99,58 @@ Connection request from [127.0.0.1]
 220 Hi there
 EHLO the.local.host.name
 250-yeah mate
-250
+250 LIMITS MAILMAX=5 RCPTMAX=1
 MAIL FROM:<CALLER@the.local.host.name>
 250 mail cmd 1 good
-RCPT TO:<r2_2.test.ex@the.local.host.name>
+RCPT TO:<r3_2.test.ex@the.local.host.name>
 250 rcpt cmd good
 DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
-       id 10HmaY-0005vi-00;
+       id 10HmaZ-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
-Subject: message 2
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Subject: message 3
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 message 6 received
+MAIL FROM:<CALLER@the.local.host.name>
+250 mail cmd 2 good
+RCPT TO:<r4_1.test.ex@the.local.host.name>
+250 rcpt cmd good
+DATA
+352 go ahead
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+       (envelope-from <CALLER@the.local.host.name>)
+       id 10HmbA-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Subject: message 4
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
+From: CALLER_NAME <CALLER@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 message 7 received
+MAIL FROM:<CALLER@the.local.host.name>
+250 mail cmd 3 good
+RCPT TO:<r4_2.test.ex@the.local.host.name>
+250 rcpt cmd good
+DATA
+352 go ahead
+Received: from CALLER by the.local.host.name with local (Exim x.yz)
+       (envelope-from <CALLER@the.local.host.name>)
+       id 10HmbA-000000005vi-0000;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Subject: message 4
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
+From: CALLER_NAME <CALLER@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 message 8 received
 QUIT
 221 bye
 Expected EOF read from client
Master Exim source repository