diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-03-30 21:48:32 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-04-09 18:00:17 +0100 |
| commit | 76146973f89f0e9265d85827285b9258910a56d7 (patch) | |
| tree | cdb91a1e9722f06886e17126b58f779c6b8ccd06 /test/confs | |
| parent | 1e06383a8b5eaaf67910c94c737e8d9b5d16a00a (diff) | |
More care with headers add/remove lists. Bug 1452
As a side-effect, playing games with newlines no longer gives an altered message body/
Testcase 0324 is questionable (though passing)
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/0096 | 3 | ||||
| -rw-r--r-- | test/confs/0097 | 5 | ||||
| -rw-r--r-- | test/confs/0166 | 6 |
3 files changed, 11 insertions, 3 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 |