From: Barry Warsaw <barry@python.org>
Date: Sat, 6 Nov 2004 00:04:52 +0000 (+0000)
Subject: get_boundary(): Fix for SF bug #1060941.  RFC 2046 says boundaries may begin
X-Git-Tag: v2.4c1~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93d9d5fb37cca015444e4579d260eac8eacad96f;p=thirdparty%2FPython%2Fcpython.git

get_boundary(): Fix for SF bug #1060941.  RFC 2046 says boundaries may begin
-- but not end -- with whitespace.

I will backport to Python 2.3.
---

diff --git a/Lib/email/Message.py b/Lib/email/Message.py
index 977f802305b8..b466f396d92a 100644
--- a/Lib/email/Message.py
+++ b/Lib/email/Message.py
@@ -719,7 +719,8 @@ class Message:
         boundary = self.get_param('boundary', missing)
         if boundary is missing:
             return failobj
-        return Utils.collapse_rfc2231_value(boundary).strip()
+        # RFC 2046 says that boundaries may begin but not end in w/s
+        return Utils.collapse_rfc2231_value(boundary).rstrip()
 
     def set_boundary(self, boundary):
         """Set the boundary parameter in Content-Type to 'boundary'.