------------------------------------------------------------
revno: 1097
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Wed 2008-06-11 15:48:16 -0700
message:
Fixed a problem in Decorate.py that could result in a multipart
message with no part headers for the original body part (1991348).
modified:
Mailman/Handlers/Decorate.py
NEWS
=== modified file 'Mailman/Handlers/Decorate.py'
--- a/Mailman/Handlers/Decorate.py 2008-01-16 18:30:35 +0000
+++ b/Mailman/Handlers/Decorate.py 2008-06-11 22:48:16 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2008 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
@@ -159,9 +159,11 @@
# basis of the interior, wrapped Message.
inner = Message()
# Which headers to copy? Let's just do the Content-* headers
+ copied = False
for h, v in msg.items():
if h.lower().startswith('content-'):
inner[h] = v
+ copied = True
inner.set_payload(msg.get_payload())
# For completeness
inner.set_unixfrom(msg.get_unixfrom())
@@ -171,6 +173,10 @@
# get_content_charset isn't. However, do make sure there is a default
# content-type, even if the original message was not MIME.
inner.set_default_type(msg.get_default_type())
+ if not copied:
+ inner['Content-Type'] = inner.get_content_type()
+ if msg['mime-version'] == None:
+ msg['MIME-Version'] = '1.0'
# BAW: HACK ALERT.
if hasattr(msg, '__version__'):
inner.__version__ = msg.__version__
=== modified file 'NEWS'
--- a/NEWS 2008-06-08 12:30:11 +0000
+++ b/NEWS 2008-06-11 22:48:16 +0000
@@ -58,6 +58,9 @@
- Changed some non-ascii characters in templates/de/*.html to HTML
entities.
+ - Fixed a problem in Decorate.py that could result in a multipart
+ message with no part headers for the original body part (1991348).
+
Miscellaneous
- Brad Knowles' mailman daily status report script updated to 0.0.18.
--
Stable, maintained release series
https://code.launchpad.net/~mailman-coders/mailman/2.1
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
