Fix cutthrough delivery for more than one iteration of address redirection. Bug...

[exim.git] / test / scripts / 4200-International / 4201

diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index d2fb96cdfce7bd30480e39ee701f00f8def552c0..fc9a50741745236a74c0a1dce024774c48b6f754 100644 (file)
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -1,5 +1,5 @@
-# Internationalised mail: smtp
-# Exim test configuration 4200
+# Internationalised mail: smtp input and forwarding
+# Exim test configuration 4201

 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****


@@ -31,7 +31,7 @@ QUIT
 ****
 #
 #
 ****
 #
 #

-# utf-8 from, Basic smtp input, no delivery
+# utf-8 from, Basic smtp input, no delivery.  Two messages in a connection.

 client 127.0.0.1 PORT_D
 ??? 220
 EHLO client
 client 127.0.0.1 PORT_D
 ??? 220
 EHLO client


@@ -52,40 +52,27 @@ Subject: test
 body
 .
 ??? 250
 body
 .
 ??? 250

-QUIT
-??? 221
-****
-#
-#
-# utf-8 from, -bs input and forwarding
-exim -bs -odi
-EHLO client.bh
-MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
+MAIL FROM: <ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com> SMTPUTF8
+??? 250

 RCPT TO: <usery@test.ex>
 RCPT TO: <usery@test.ex>

+??? 250

 DATA
 DATA

+??? 354

 Subject: test
 
 body
 .
 Subject: test
 
 body
 .

+??? 250

 QUIT
 QUIT

+??? 221

 ****
 #
 #
 ****
 #
 #

-#
-killdaemon
-sleep 1
-exim -DSERVER=server -qqff
-****
-#
-#
-exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
-****
-#
-# forwarding fails when target does not support SMTPUTF8
+# utf-8 from, -bs input and forwarding

 exim -bs -odi
 exim -bs -odi

-EHLO client.ffail
-MAIL FROM: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> SMTPUTF8
-RCPT TO: <userz@test.ex>
+EHLO client.bh
+MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
+RCPT TO: <usery@test.ex>

 DATA
 Subject: test
 
 DATA
 Subject: test
 


@@ -94,9 +81,7 @@ body
 QUIT
 ****
 #
 QUIT
 ****
 #

-#
-#

 killdaemon
 killdaemon

-#
-exim -qfl
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 ****

+no_msglog_check