diff options
| author | Todd Lyons <tlyons@exim.org> | 2014-04-15 09:53:43 -0700 |
|---|---|---|
| committer | Todd Lyons <tlyons@exim.org> | 2014-04-15 09:53:43 -0700 |
| commit | 364e49ab87bf81774f12f8b0e21509eb51c88b71 (patch) | |
| tree | 86b43906007d8a6cee2f7ad7cea22f2f8aff8a55 /test/mail | |
| parent | 3695be34bdae5e69ed8188587f03b87b6e929d42 (diff) | |
| parent | 10cc8a1e4c3077eefcb37878990753d1d49cf363 (diff) | |
Merge branch 'master' of ssh://git.exim.org/home/git/exim
Fixed Conflicts:
doc/doc-txt/ChangeLog
Diffstat (limited to 'test/mail')
| -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 |
5 files changed, 8 insertions, 5 deletions
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: |