Ticket #28678: multiparser_json.diff

multipartparser.py

@@ -9 +9 @@
 import base64
 import binascii
 import cgi
+import json
 import sys
 
 from django.conf import settings
@@ -175 +176 @@
                 if item_type == FIELD:
                     # Avoid storing more than DATA_UPLOAD_MAX_NUMBER_FIELDS.
                     num_post_keys += 1
+                    text_info = True
                     if (settings.DATA_UPLOAD_MAX_NUMBER_FIELDS is not None and
                             settings.DATA_UPLOAD_MAX_NUMBER_FIELDS < num_post_keys):
                         raise TooManyFieldsSent(
@@ -194 +196 @@
                             data = base64.b64decode(raw_data)
                         except _BASE64_DECODE_ERROR:
                             data = raw_data
+                    elif 'content-type' in meta_data and meta_data['content-type'][0].strip() == 'application/json':
+                        raw_data = field_stream.read(size=read_size)
+                        num_bytes_read += len(raw_data)
+                        try:
+                            data = json.loads(raw_data)
+                            text_info = False
+                        except ValueError:
+                            data = raw_data
                     else:
                         data = field_stream.read(size=read_size)
                         num_bytes_read += len(data)
@@ -205 +215 @@
                             num_bytes_read > settings.DATA_UPLOAD_MAX_MEMORY_SIZE):
                         raise RequestDataTooBig('Request body exceeded settings.DATA_UPLOAD_MAX_MEMORY_SIZE.')
 
-                    self._post.appendlist(field_name, force_text(data, encoding, errors='replace'))
+                    if text_info:
+                        self._post.appendlist(field_name, force_text(data, encoding, errors='replace'))
+                    else:
+                        self._post.appendlist(field_name, data)
                 elif item_type == FILE:
                     # This is a file, use the handler...
                     file_name = disposition.get('filename')