LibreSSL: fixes pulled from OpenBSD patchset

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

diff --git a/test/scripts/4200-International/4207 b/test/scripts/4200-International/4207
index 66e77f0a9691d072c468772bf170cb745078ef9c..fa32bec928dfd322fb767d6ce8767135169ca592 100644 (file)
--- a/test/scripts/4200-International/4207
+++ b/test/scripts/4200-International/4207
@@ -1,7 +1,7 @@
 # Internationalised mail: control = utf8_downconvert
 # Exim test configuration 4207
 #
 # Internationalised mail: control = utf8_downconvert
 # Exim test configuration 4207
 #

-exim -DSERVER=server -bd -oX PORT_D
+exim -DSERVER=server -DOPTION="" -bd -oX PORT_D

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


@@ -9,7 +9,33 @@ exim -DSERVER=server -bd -oX PORT_D
 exim -bs -odi -DCONTROL="control=utf8_downconvert"
 EHLO client.bh
 MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
 exim -bs -odi -DCONTROL="control=utf8_downconvert"
 EHLO client.bh
 MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8

-RCPT TO: <user.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex>
+RCPT TO: <user1.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex>
+DATA
+Subject: test
+
+body
+.
+QUIT
+****
+#
+# utf-8 from, optional downconvert, delivery redirected
+exim -bs -odi -DCONTROL="control=utf8_downconvert/-1"
+EHLO client.bh
+MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
+RCPT TO: <zuser2.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex>
+DATA
+Subject: test
+
+body
+.
+QUIT
+****
+#
+# utf-8 from, never-downconvert set by ACL, overridden by transport
+exim -bs -odi -DCONTROL="control=utf8_downconvert/0" -DSTRICT=1
+EHLO client.bh
+MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
+RCPT TO: <user3.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex>

 DATA
 Subject: test
 
 DATA
 Subject: test
 


@@ -19,6 +45,6 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 killdaemon

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

 ****
 no_msglog_check
 ****
 no_msglog_check