------------------------------------------------------------
revno: 1372
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Sun 2015-01-11 14:07:05 -0800
message:
Due to a prior change, From: header munging would unnecessarily add the
original From: to Cc: when was already in an original Reply-To:. Fixed.
modified:
Mailman/Handlers/CookHeaders.py
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'Mailman/Handlers/CookHeaders.py'
--- Mailman/Handlers/CookHeaders.py 2015-01-05 03:04:43 +0000
+++ Mailman/Handlers/CookHeaders.py 2015-01-11 22:07:05 +0000
@@ -206,10 +206,19 @@
# We also need to put the old From: in Reply-To: in all cases where
# it is not going in Cc:. This is when reply_goes_to_list == 0 and
# either there was no original Reply-To: or we stripped it.
- if o_from and mlist.reply_goes_to_list == 0 and not o_rt:
- add(o_from)
- # Flag that we added it.
- o_from = None
+ # However, if there was an original Reply-To:, unstripped, and it
+ # contained the original From: address we need to flag that it's
+ # there so we don't add the original From: to Cc:
+ if o_from and mlist.reply_goes_to_list == 0:
+ if o_rt:
+ if d.has_key(o_from[1].lower()):
+ # Original From: address is in original Reply-To:.
+ # Pretend we added it.
+ o_from = None
+ else:
+ add(o_from)
+ # Flag that we added it.
+ o_from = None
# Set Reply-To: header to point back to this list. Add this last
# because some folks think that some MUAs make it easier to delete
# addresses from the right than from the left.
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
