diff options
| author | Mark Sapiro <mark@msapiro.net> | 2015-01-03 18:24:24 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2015-01-03 18:24:24 -0800 |
| commit | 85a6679a3ea5b1ff085453f4e1ed921b5320690b (patch) | |
| tree | 13377507468a9d1fcc8459d0b90e55a3bf4cfb69 /Mailman/Handlers/WrapMessage.py | |
| parent | d196f39ced49094eab5d0d8d8e42308835ef1cf5 (diff) | |
| download | mailman2-85a6679a3ea5b1ff085453f4e1ed921b5320690b.tar.gz mailman2-85a6679a3ea5b1ff085453f4e1ed921b5320690b.tar.xz mailman2-85a6679a3ea5b1ff085453f4e1ed921b5320690b.zip | |
When applying DMARC mitigations, CookHeaders now adds the original From:
to Cc: rather than Reply-To: in some cases to make MUA 'reply' and
'reply all' more consistent with the non-DMARC cases.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Handlers/WrapMessage.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Mailman/Handlers/WrapMessage.py b/Mailman/Handlers/WrapMessage.py index 4fd88ed9..fba6bc2a 100644 --- a/Mailman/Handlers/WrapMessage.py +++ b/Mailman/Handlers/WrapMessage.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2014 by the Free Software Foundation, Inc. +# Copyright (C) 2013-2015 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -49,6 +49,9 @@ def process(mlist, msg, msgdata): if a_h.get('Reply-To'): del msg['reply-to'] msg['Reply-To'] = a_h.get('Reply-To') + if a_h.get('Cc'): + del msg['cc'] + msg['Cc'] = a_h.get('Cc') return # There are various headers in msg that we don't want, so we basically |