Delivery: quieten smtp transport conn reuse vs. delivery race. Bug 1810

[users/heiko/exim.git] / test / confs / 0096

diff --git a/test/confs/0096 b/test/confs/0096
index 1ee9b746f424937002f99f149b6f43f79146e31e..5ef2ec20e202adf62b2af243978a52e5edc4722c 100644 (file)
--- a/test/confs/0096
+++ b/test/confs/0096
@@ -1,12 +1,13 @@
 # Exim test configuration 0096
 
 exim_path = EXIM_PATH
 # Exim test configuration 0096
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 host_lookup_order = bydns

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -21,7 +22,8 @@ localuser:
   driver = accept
   local_parts = userx
   headers_add = "${if def:h_x-rbl-warning: {Added: xxxx}fail}"
   driver = accept
   local_parts = userx
   headers_add = "${if def:h_x-rbl-warning: {Added: xxxx}fail}"

-  headers_remove = "${if def:h_x-rbl-warning: {subject}fail}"
+  # Colon-sep list!
+  headers_remove = "${if def::h_x-rbl-warning:: {subject}fail}"

   transport = local_delivery
 
 
   transport = local_delivery