LibreSSL: fixes pulled from OpenBSD patchset

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

diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index bac040f9b9975a0ca4f32d1c82547167af0115d4..27a9775524dd5476e35001f6629cd27dc6ebd47b 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
 ****


@@ -11,6 +11,7 @@ client 127.0.0.1 PORT_D
 EHLO client
 ??? 250-
 ??? 250-SIZE
 EHLO client
 ??? 250-
 ??? 250-SIZE

+??? 250-LIMITS

 ??? 250-8BITMIME
 ??? 250-PIPELINING
 ??? 250-SMTPUTF8
 ??? 250-8BITMIME
 ??? 250-PIPELINING
 ??? 250-SMTPUTF8


@@ -31,12 +32,13 @@ 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
 ??? 250-
 ??? 250-SIZE
 client 127.0.0.1 PORT_D
 ??? 220
 EHLO client
 ??? 250-
 ??? 250-SIZE

+??? 250-LIMITS

 ??? 250-8BITMIME
 ??? 250-PIPELINING
 ??? 250-SMTPUTF8
 ??? 250-8BITMIME
 ??? 250-PIPELINING
 ??? 250-SMTPUTF8


@@ -49,6 +51,17 @@ DATA
 ??? 354
 Subject: test
 
 ??? 354
 Subject: test
 

+body
+.
+??? 250
+MAIL FROM: <ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com> SMTPUTF8
+??? 250
+RCPT TO: <usery@test.ex>
+??? 250
+DATA
+??? 354
+Subject: test
+

 body
 .
 ??? 250
 body
 .
 ??? 250


@@ -57,8 +70,42 @@ QUIT
 ****
 #
 #
 ****
 #
 #

+# utf-8 from, -bs input and forwarding
+exim -bs -odi
+EHLO client.bh
+MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
+RCPT TO: <usery@test.ex>
+DATA
+Subject: test
+
+body
+.
+QUIT
+****
+#

 killdaemon
 killdaemon

-exim -DSERVER=server -qq
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 ****

+#
+#
+# Attempt to use when not advertised
+exim -DSERVER=server -DOPTION=: -bd -oX PORT_D
+****
+client 127.0.0.1 PORT_D
+??? 220
+EHLO client
+??? 250-
+??? 250-SIZE
+??? 250-LIMITS
+??? 250-8BITMIME
+??? 250-PIPELINING
+??? 250 HELP
+MAIL FROM: <someone@some.domain> SMTPUTF8
+??? 501
+QUIT
+??? 221
+****
+killdaemon
+#
+#

 no_msglog_check
 no_msglog_check

-