Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0427

diff --git a/test/scripts/0000-Basic/0427 b/test/scripts/0000-Basic/0427
index 540d60ae5ef42c23067753ef92c94d0850b49d45..8613b2b777fa1828637be2e6da93768a4b9b2780 100644 (file)
--- a/test/scripts/0000-Basic/0427
+++ b/test/scripts/0000-Basic/0427
@@ -311,6 +311,13 @@ exim -bf test-data <aux-fixed/TESTNUM.message
 ****
 catwrite test-data
 # Sieve filter
 ****
 catwrite test-data
 # Sieve filter

+require "encoded-character";
+if not header :matches "x-special1" "*${hex:00}*" { discard; }
+****
+exim -bf test-data <aux-fixed/TESTNUM.message
+****
+catwrite test-data
+# Sieve filter

 if not header :matches "x-special2" "\\?*\\*" { discard; }
 ****
 exim -bf test-data <aux-fixed/TESTNUM.message
 if not header :matches "x-special2" "\\?*\\*" { discard; }
 ****
 exim -bf test-data <aux-fixed/TESTNUM.message


@@ -510,13 +517,13 @@ exim -bf test-data <aux-fixed/TESTNUM.message3
 ****
 catwrite test-data
 # Sieve filter
 ****
 catwrite test-data
 # Sieve filter

-if header "X-Wrapped" "eins zwei drei" { discard; }
+if header "X-Wrapped" "eins zwei  drei" { discard; }

 ****
 exim -bf test-data <aux-fixed/TESTNUM.message3
 ****
 catwrite test-data
 # Sieve filter
 ****
 exim -bf test-data <aux-fixed/TESTNUM.message3
 ****
 catwrite test-data
 # Sieve filter

-if header "x-nomimewrap" "=?iso-8859-1?q?abc def ghi?=" { discard; }
+if header "x-nomimewrap" "=?iso-8859-1?q?abc def  ghi?=" { discard; }

 ****
 exim -bf test-data <aux-fixed/TESTNUM.message3
 ****
 ****
 exim -bf test-data <aux-fixed/TESTNUM.message3
 ****