From 71c158466dab1d452d450843e8c204a42200b7a8 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 28 Jul 2018 20:48:19 +0100 Subject: I18N: add a utf8_downconvert option to the smtp transport. Bug 2248 --- test/confs/4201 | 3 +++ test/log/4207 | 22 ++++++++++++++-------- test/runtest | 1 + test/scripts/0000-Basic/0577 | 1 + test/scripts/4200-International/4207 | 17 +++++++++++++++-- test/stdout/0577 | 1 - test/stdout/4207 | 12 ++++++++++++ 7 files changed, 46 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/confs/4201 b/test/confs/4201 index 9242eb063..17afe9f78 100644 --- a/test/confs/4201 +++ b/test/confs/4201 @@ -124,5 +124,8 @@ local_delivery: rmt_smtp: driver = smtp +.ifdef STRICT + utf8_downconvert = STRICT +.endif # End diff --git a/test/log/4207 b/test/log/4207 index e39c0f5fb..3bd01a3dd 100644 --- a/test/log/4207 +++ b/test/log/4207 @@ -1,17 +1,23 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for user.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex -1999-03-02 09:44:33 10HmaX-0005vi-00 => xn--user.-f99s29a80cg5i8xgv8fnb734dq4gv6av8eczab60f5jch09a5ea085a0marwd373e180hea90e@test.ex F= R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for user1.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => xn--user1.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex F= R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for zuser.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => xn--user.-f99s29a80cg5i8xgv8fnb734dq4gv6av8eczab60f5jch09a5ea085a0marwd373e180hea90e@test.ex F= R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for zuser2.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 => xn--user2.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex F= R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for user3.세계의모든사람들이한국어를이해한다면얼마나좋을까@test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 => xn--user3.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex F= R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaY-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for xn--user.-f99s29a80cg5i8xgv8fnb734dq4gv6av8eczab60f5jch09a5ea085a0marwd373e180hea90e@test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for xn--user.-f99s29a80cg5i8xgv8fnb734dq4gv6av8eczab60f5jch09a5ea085a0marwd373e180hea90e@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for xn--user1.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@the.local.host.name for xn--user2.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex +1999-03-02 09:44:33 10HmbC-0005vi-00 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name for xn--user3.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex 1999-03-02 09:44:33 Start queue run: pid=pppp -qqff -1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=localuser +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=localuser +1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=localuser 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: R=localuser +1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qqff diff --git a/test/runtest b/test/runtest index 9f556660d..a38f112af 100755 --- a/test/runtest +++ b/test/runtest @@ -1613,6 +1613,7 @@ $munges = |hosts_(avoid|nopass|noproxy|require|verify_avoid)_tls |socks_proxy |tls_[^ ]* + |utf8_downconvert )($|[ ]=)/x' }, 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: +RCPT TO: 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: +RCPT TO: +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: DATA Subject: test diff --git a/test/stdout/0577 b/test/stdout/0577 index 80cf3da88..ef918a86b 100644 --- a/test/stdout/0577 +++ b/test/stdout/0577 @@ -14,7 +14,6 @@ gecos_name = CALLER_NAME dns_cname_loops = 9 chunking_advertise_hosts = # 1 "TESTSUITE/aux-var/std_conf_prefix" -tls_advertise_hosts = # 1 "TESTSUITE/test-config" # 2 "TESTSUITE/test-config" # 1 "TESTSUITE/confs/0577./aaa" diff --git a/test/stdout/4207 b/test/stdout/4207 index 948434ff3..34a2cfe36 100644 --- a/test/stdout/4207 +++ b/test/stdout/4207 @@ -22,3 +22,15 @@ 354 Enter message, ending with "." on a line by itself 250 OK id=10HmaZ-0005vi-00 221 the.local.host.name closing connection +220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-the.local.host.name Hello CALLER at client.bh +250-SIZE 52428800 +250-8BITMIME +250-PIPELINING +250-SMTPUTF8 +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmbB-0005vi-00 +221 the.local.host.name closing connection -- cgit v1.2.3