diff options
Diffstat (limited to 'Mailman/Queue/BounceRunner.py')
| -rw-r--r-- | Mailman/Queue/BounceRunner.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Mailman/Queue/BounceRunner.py b/Mailman/Queue/BounceRunner.py index 02524cabc..9f46b59af 100644 --- a/Mailman/Queue/BounceRunner.py +++ b/Mailman/Queue/BounceRunner.py @@ -133,14 +133,14 @@ class BounceRunner(Runner): def verp_bounce(mlist, msg): bmailbox, bdomain = Utils.ParseEmail(mlist.GetBouncesEmail()) - # Sadly not every MTA bounces VERP messages correctly. Fall back to - # Delivered-to: and Apparently-To:, and then short-circuit if we still - # don't have anything to work with. Note that there can be multiple - # Delivered-To: headers so we need to search them all (and we don't - # worry about false positives for forwarded email, because only one - # should match VERP_REGEXP). + # Sadly not every MTA bounces VERP messages correctly, or consistently. + # Fall back to Delivered-To: (Postfix), Envelope-To: (Exim) and + # Apparently-To:, and then short-circuit if we still don't have anything + # to work with. Note that there can be multiple Delivered-To: headers so + # we need to search them all (and we don't worry about false positives for + # forwarded email, because only one should match VERP_REGEXP). vals = [] - for header in ('to', 'delivered-to', 'apparently-to'): + for header in ('to', 'delivered-to', 'envelope-to', 'apparently-to'): vals.extend(msg.get_all(header, [])) for field in vals: to = parseaddr(field)[1] |