From 71c158466dab1d452d450843e8c204a42200b7a8 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 28 Jul 2018 20:48:19 +0100
Subject: I18N: add a utf8_downconvert option to the smtp transport.  Bug 2248

---
 test/scripts/0000-Basic/0577         |  1 +
 test/scripts/4200-International/4207 | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'test/scripts')

diff --git a/test/scripts/0000-Basic/0577 b/test/scripts/0000-Basic/0577
index 1bd510ae3..bbd2954c7 100644
--- a/test/scripts/0000-Basic/0577
+++ b/test/scripts/0000-Basic/0577
@@ -1,2 +1,3 @@
 # Test different variants of .includes
+munge optional_config
 exim -bP config
diff --git a/test/scripts/4200-International/4207 b/test/scripts/4200-International/4207
index 061a2c6b3..fa32bec92 100644
--- a/test/scripts/4200-International/4207
+++ b/test/scripts/4200-International/4207
@@ -9,7 +9,7 @@ exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
 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
 
@@ -22,7 +22,20 @@ QUIT
 exim -bs -odi -DCONTROL="control=utf8_downconvert/-1"
 EHLO client.bh
 MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
-RCPT TO: <zuser.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex>
+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
 
-- 
cgit v1.2.3