Fix CVE-2016-1531

[exim.git] / test / confs / 4000

diff --git a/test/confs/4000 b/test/confs/4000
index cc08c71d4358902017bba30cd697a6e2eec06dec..0c057632912e8b82018d2788a0caf130e1968db0 100644 (file)
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,6 +1,7 @@
 # Exim test configuration 4000
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s
@@ -49,20 +50,23 @@ check_data:
 
 check_mime:
   warn     decode  = default
-           message = X-$mime_part_count-content-type: $mime_content_type\n\
-                     X-$mime_part_count-filename: $mime_filename\n\
-                     X-$mime_part_count-charset: $mime_charset\n\
-                     X-$mime_part_count-boundary: $mime_boundary\n\
-                     X-$mime_part_count-content-disposition: $mime_content_disposition\n\
-                     X-$mime_part_count-content-transfer-encoding: $mime_content_transfer_encoding\n\
-                     X-$mime_part_count-content-id: $mime_content_id\n\
-                     X-$mime_part_count-content-description: $mime_content_description\n\
-                     X-$mime_part_count-is-multipart: $mime_is_multipart\n\
-                     X-$mime_part_count-is-coverletter: $mime_is_coverletter\n\
-                     X-$mime_part_count-is-rfc822: $mime_is_rfc822\n\
-                     X-$mime_part_count-decode-filename: $mime_decoded_filename\n\
-                     X-$mime_part_count-content-size: $mime_content_size
-
+           add_header = X-$mime_part_count-content-type: $mime_content_type\n\
+                        X-$mime_part_count-filename: $mime_filename\n\
+                        X-$mime_part_count-charset: $mime_charset\n\
+                        X-$mime_part_count-boundary: $mime_boundary\n\
+                        X-$mime_part_count-content-disposition: $mime_content_disposition\n\
+                        X-$mime_part_count-content-transfer-encoding: $mime_content_transfer_encoding\n\
+                        X-$mime_part_count-content-id: $mime_content_id\n\
+                        X-$mime_part_count-content-description: $mime_content_description\n\
+                        X-$mime_part_count-is-multipart: $mime_is_multipart\n\
+                        X-$mime_part_count-is-coverletter: $mime_is_coverletter\n\
+                        X-$mime_part_count-is-rfc822: $mime_is_rfc822\n\
+                        X-$mime_part_count-decode-filename: $mime_decoded_filename\n\
+                        X-$mime_part_count-content-size: $mime_content_size
+  warn     mime_regex = (?s)\
+                        (?=Test quoted-printable =)\
+                        (?=.*?Continued line with this)
+           add_header = X-mime-regex: matched
   accept