Ticket #6256: 6256-2.diff

django/http/__init__.py

@@ -9 +9 @@
 except ImportError:
     from cgi import parse_qsl
 
+from email.parser import Parser
+try:
+    from email.feedparser import FeedParser
+    class ParserClass(Parser):
+        # Copy of Python's Parser's parse patched to properly deal with CRLF 
+        # sequences that happen to fall at an 8192-byte boundary (see
+        # http://bugs.python.org/issue1555570)
+        def parse(self, fp, headersonly=False):
+            """Create a message structure from the data in a file.
+    
+            Reads all the data from the file and returns the root of the message
+            structure.  Optional headersonly is a flag specifying whether to stop
+            parsing after reading the headers or not.  The default is False,
+            meaning it parses the entire contents of the file.
+            """
+            feedparser = FeedParser(self._class)
+            if headersonly:
+                feedparser._set_headersonly()
+            while True:
+                data = fp.read(8192)
+                if not data:
+                    break
+                if data[-1] == '\r':
+                    # Don't split a CRLF.
+                    data += fp.read(1)
+                feedparser.feed(data)
+            return feedparser.close()
+except ImportError:
+    ParserClass = Parser
+
 from django.utils.datastructures import MultiValueDict, FileDict
 from django.utils.encoding import smart_str, iri_to_uri, force_unicode
 
@@ -108 +138 @@
     from cgi import parse_header
     raw_message = '\r\n'.join(['%s:%s' % pair for pair in header_dict.items()])
     raw_message += '\r\n\r\n' + post_data
-    msg = email.message_from_string(raw_message)
+    msg = ParserClass().parsestr(raw_message)
     POST = QueryDict('', mutable=True)
     FILES = MultiValueDict()
     for submessage in msg.get_payload():