diff options
| author | Phil Pennock <pdp@exim.org> | 2018-08-16 21:17:32 -0400 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2018-08-16 21:19:09 -0400 |
| commit | 0a682b6cd5f70e94b84fa17022554b48c97a63bd (patch) | |
| tree | 94ee5b86194de3a023011b5f5dea24a133bfd7bb /test | |
| parent | d16931c81f3e500fa6eafe5ec1c5d8e7db63e65a (diff) | |
Fix utf8clean not replacing incomplete final character
Before, it was just dropped, but we document that it's replaced by ?.
Tests updated, manual test-case for -be prompt is:
${utf8clean:${length_1:フィル}}
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0600 | 20 | ||||
| -rw-r--r-- | test/log/0600 | 12 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0600 | 1 |
3 files changed, 19 insertions, 14 deletions
diff --git a/test/confs/0600 b/test/confs/0600 index 29bc5bf1a..f6405460d 100644 --- a/test/confs/0600 +++ b/test/confs/0600 @@ -20,15 +20,17 @@ begin acl check_data: accept logwrite = \ - x-test-header-good1: ${utf8clean:$h_x-test-header-good1:} - logwrite = \ - x-test-header-good2: ${utf8clean:$h_x-test-header-good2:} - logwrite = \ - x-test-header-too-short: ${utf8clean:$h_x-test-header-too-short:} - logwrite = \ - x-test-header-too-long: ${utf8clean:$h_x-test-header-too-long:} - logwrite = \ - x-test-header-too-big: ${utf8clean:$h_x-test-header-too-big:} + x-test-header-good1: ${utf8clean:$h_x-test-header-good1:} + logwrite = \ + x-test-header-good2: ${utf8clean:$h_x-test-header-good2:} + logwrite = \ + x-test-header-too-short: ${utf8clean:$h_x-test-header-too-short:} + logwrite = \ + x-test-header-too-long: ${utf8clean:$h_x-test-header-too-long:} + logwrite = \ + x-test-header-too-big: ${utf8clean:$h_x-test-header-too-big:} + log_write = \ + x-test-header-truncated: ${utf8clean:$h_x-test-header-truncated:} diff --git a/test/log/0600 b/test/log/0600 index 8fc8cfc36..a18b159d2 100644 --- a/test/log/0600 +++ b/test/log/0600 @@ -3,14 +3,16 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 x-test-header-too-short: ?.?.?.\303\244-?.-\303\234.?..?.-?.-?..-?.-?.-?.-?.-?..-?..?. 1999-03-02 09:44:33 10HmaX-0005vi-00 x-test-header-too-long: ?????-\303\244-?????--\303\226-\303\204-\302\264-\340\244\221-\340\244\225-\340\244\234-\341\220\201-\341\221\214-\341\221\225-?????\360\253\237\206 1999-03-02 09:44:33 10HmaX-0005vi-00 x-test-header-too-big: ?-----\363\200\200\200 +1999-03-02 09:44:33 10HmaX-0005vi-00 x-test-header-truncated: ? 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER <CALLER@the.local.host.name> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-good1: -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-good2: -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-short: -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-long: -1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-big: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-good1: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-good2: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-short: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-long: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-big: +1999-03-02 09:44:33 10HmaY-0005vi-00 x-test-header-too-truncated: 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@the.local.host.name> R=localuser T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/scripts/0000-Basic/0600 b/test/scripts/0000-Basic/0600 index 9d5e67b5b..43f728822 100644 --- a/test/scripts/0000-Basic/0600 +++ b/test/scripts/0000-Basic/0600 @@ -10,6 +10,7 @@ x-test-header-good2: ßüöä€ÜÖÄ´ऑकजᐁᑌᑕ𫝆𫟘 x-test-header-too-short: ...ä-.-Ü....-.-..-.-.-.-.-..-... x-test-header-too-long: -ä---Ö-Ä-´-ऑ-क-ज-ᐁ-ᑌ-ᑕ-𫟆 x-test-header-too-big: ----- +x-test-header-truncated: Subject: This is a test message. This is a test message. |