diff options
author | bwarsaw <> | 2003-04-22 03:36:17 +0000 |
---|---|---|
committer | bwarsaw <> | 2003-04-22 03:36:17 +0000 |
commit | 6c666927c0a9e4f68afa86d6ad298f54f4f80c88 (patch) | |
tree | 2c1a18eaba69bebe3309245286b2fa9fbb43ac6b /Mailman/Handlers/Cleanse.py | |
parent | 5469fd6e01b8e059aac762825d38aedd47f64fd4 (diff) | |
download | mailman2-6c666927c0a9e4f68afa86d6ad298f54f4f80c88.tar.gz mailman2-6c666927c0a9e4f68afa86d6ad298f54f4f80c88.tar.xz mailman2-6c666927c0a9e4f68afa86d6ad298f54f4f80c88.zip |
Backporting once again from the trunk.
I18ners please double check (except Tokio). It's always so painful to
resolve conflicts here, I hope I got them right.
Diffstat (limited to '')
-rw-r--r-- | Mailman/Handlers/Cleanse.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Mailman/Handlers/Cleanse.py b/Mailman/Handlers/Cleanse.py index 143f9500..b2c631fa 100644 --- a/Mailman/Handlers/Cleanse.py +++ b/Mailman/Handlers/Cleanse.py @@ -1,17 +1,17 @@ -# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2003 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 # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software +# along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """Cleanse certain headers from all messages.""" @@ -29,6 +29,8 @@ def process(mlist, msg, msgdata): del msg['from'] del msg['reply-to'] del msg['sender'] + # Hotmail sets this one + del msg['x-originating-email'] msg['From'] = mlist.GetListEmail() msg['Reply-To'] = mlist.GetListEmail() # Some headers can be used to fish for membership |