diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0096 | 3 | ||||
| -rw-r--r-- | test/confs/0097 | 5 | ||||
| -rw-r--r-- | test/confs/0166 | 6 | ||||
| -rw-r--r-- | test/mail/0046.userx | bin | 3497 -> 3495 bytes | |||
| -rw-r--r-- | test/mail/0166.userx | 4 | ||||
| -rw-r--r-- | test/mail/0166.usery | 4 | ||||
| -rw-r--r-- | test/mail/0351.userx | 1 | ||||
| -rw-r--r-- | test/mail/0412.CALLER | 4 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0481 | 2 | ||||
| -rw-r--r-- | test/stderr/5400 | 2 |
10 files changed, 21 insertions, 10 deletions
diff --git a/test/confs/0096 b/test/confs/0096 index 1ee9b746f..a182a9303 100644 --- a/test/confs/0096 +++ b/test/confs/0096 @@ -21,7 +21,8 @@ localuser: 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 diff --git a/test/confs/0097 b/test/confs/0097 index c8e773fc2..ad88aee09 100644 --- a/test/confs/0097 +++ b/test/confs/0097 @@ -21,7 +21,8 @@ localuser: driver = accept local_parts = userx headers_add = "${if def:h_x-rbl-warning: {Added: by router}}" - headers_remove = "${if def:h_x-rbl-warning: {subject}}" + # Colon-sep list! + headers_remove = "${if def::h_x-rbl-warning:: {subject}}" transport = local_delivery @@ -35,7 +36,7 @@ local_delivery: envelope_to_add file = DIR/test-mail/$local_part headers_add = "${if def:h_tadd: {Added: by transport}}" - headers_remove = "${if def:h_tadd: {tadd}}" + headers_remove = "${if def::h_tadd:: {tadd}}" return_path_add user = CALLER diff --git a/test/confs/0166 b/test/confs/0166 index b94331b44..7d2f06611 100644 --- a/test/confs/0166 +++ b/test/confs/0166 @@ -30,6 +30,9 @@ user: headers_add = X-Delivered-To: $local_part@$domain retry_use_local_part transport = local_delivery + headers_add = X-rtr-hdr: 1 + headers_add = ${if bool{false} {X-rtr-hdr: 2}} + headers_add = X-rtr-hdr: 3 # ----- Transports ----- @@ -41,6 +44,9 @@ local_delivery: envelope_to_add file = DIR/test-mail/$local_part user = CALLER + headers_add = X-tpt-hdr: 1 + headers_add = ${if bool{false} {X-tpt-hdr: 2}} + headers_add = X-tpt-hdr: 3 # End diff --git a/test/mail/0046.userx b/test/mail/0046.userx Binary files differindex cf7f26ea0..05c078ec0 100644 --- a/test/mail/0046.userx +++ b/test/mail/0046.userx diff --git a/test/mail/0166.userx b/test/mail/0166.userx index 3c58c0da1..d07630976 100644 --- a/test/mail/0166.userx +++ b/test/mail/0166.userx @@ -12,5 +12,9 @@ X-Delivered-To: b@test.ex X-Delivered-To: c@test.ex X-Delivered-To: d@test.ex X-Delivered-To: userx@test.ex +X-rtr-hdr: 1 +X-rtr-hdr: 3 +X-tpt-hdr: 1 +X-tpt-hdr: 3 diff --git a/test/mail/0166.usery b/test/mail/0166.usery index 529767368..8076ae65d 100644 --- a/test/mail/0166.usery +++ b/test/mail/0166.usery @@ -11,5 +11,9 @@ X-Delivered-To: a@test.ex X-Delivered-To: bb@test.ex X-Delivered-To: e@test.ex X-Delivered-To: usery@test.ex +X-rtr-hdr: 1 +X-rtr-hdr: 3 +X-tpt-hdr: 1 +X-tpt-hdr: 3 diff --git a/test/mail/0351.userx b/test/mail/0351.userx index 50bfd7d6c..41b34c002 100644 --- a/test/mail/0351.userx +++ b/test/mail/0351.userx @@ -19,7 +19,6 @@ Resent-From: CALLER_NAME <CALLER@test.ex> Found: yes Found2: yes FOUND-found2: !! - TO: userx@test.ex, usery@test.ex -------------------------------- diff --git a/test/mail/0412.CALLER b/test/mail/0412.CALLER index 260252beb..410121dae 100644 --- a/test/mail/0412.CALLER +++ b/test/mail/0412.CALLER @@ -7,7 +7,6 @@ From: CALLER_NAME <CALLER@test.ex> Message-Id: <E10HmaX-0005vi-00@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: no - FROM: CALLER_NAME <CALLER@test.ex> -------------------------------- REPLY_ADDRESS: CALLER_NAME <CALLER@test.ex> @@ -25,7 +24,6 @@ From: CALLER_NAME <CALLER@test.ex> Message-Id: <E10HmaY-0005vi-00@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: no - FROM: CALLER_NAME <CALLER@test.ex> -------------------------------- REPLY_ADDRESS: CALLER_NAME <CALLER@test.ex> @@ -43,7 +41,6 @@ From: CALLER_NAME <CALLER@test.ex> Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: no - FROM: CALLER_NAME <CALLER@test.ex> -------------------------------- REPLY_ADDRESS: usery@test.ex @@ -61,7 +58,6 @@ Message-Id: <E10HmbA-0005vi-00@the.local.host.name> Sender: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 Found: no - FROM: -------------------------------- REPLY_ADDRESS: diff --git a/test/scripts/0000-Basic/0481 b/test/scripts/0000-Basic/0481 index d1a9a4a70..e1b8574db 100644 --- a/test/scripts/0000-Basic/0481 +++ b/test/scripts/0000-Basic/0481 @@ -1,4 +1,4 @@ -# multiple remove_headers and trailing colons +# multiple remove_headers in routers, and trailing colons exim -odi userx Remove-Me: this header is to be removed Another: This is another header diff --git a/test/stderr/5400 b/test/stderr/5400 index 29ff83b42..1c9b0d83a 100644 --- a/test/stderr/5400 +++ b/test/stderr/5400 @@ -207,7 +207,7 @@ X-hdr-rtr: qqq added header line(s): X-hdr-rtr-new: +++ --- -added header line(s): +added header line: X-hdr-tpt-new: new --- ----------- done cutthrough headers send ------------ |