Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #10687: fixed request parsing when upload_handlers is empty. Th…

…anks, Armin Ronacher.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c40f715257b6268cfd96dbafa18e58cbc6602afa 1 parent 88f5167
Jacob Kaplan-Moss jacobian authored
1  django/core/files/base.py
View
@@ -1,5 +1,4 @@
import os
-
try:
from cStringIO import StringIO
except ImportError:
3  django/http/multipartparser.py
View
@@ -84,7 +84,8 @@ def __init__(self, META, input_data, upload_handlers, encoding=None):
# For compatibility with low-level network APIs (with 32-bit integers),
# the chunk size should be < 2^31, but still divisible by 4.
- self._chunk_size = min(2**31-4, *[x.chunk_size for x in upload_handlers if x.chunk_size])
+ possible_sizes = [x.chunk_size for x in upload_handlers if x.chunk_size]
+ self._chunk_size = min([2**31-4] + possible_sizes)
self._meta = META
self._encoding = encoding or settings.DEFAULT_CHARSET
12 tests/regressiontests/file_uploads/tests.py
View
@@ -3,12 +3,14 @@
import errno
import shutil
import unittest
+from StringIO import StringIO
from django.core.files import temp as tempfile
from django.core.files.uploadedfile import SimpleUploadedFile
from django.test import TestCase, client
from django.utils import simplejson
from django.utils.hashcompat import sha_constructor
+from django.http.multipartparser import MultiPartParser
from models import FileModel, temp_storage, UPLOAD_TO
import uploadhandler
@@ -290,3 +292,13 @@ def test_not_a_directory(self):
"%s exists and is not a directory." % UPLOAD_TO)
except:
self.fail("IOError not raised")
+
+class MultiParserTests(unittest.TestCase):
+
+ def test_empty_upload_handlers(self):
+ # We're not actually parsing here; just checking if the parser properly
+ # instantiates with empty upload handlers.
+ parser = MultiPartParser({
+ 'CONTENT_TYPE': 'multipart/form-data; boundary=_foo',
+ 'CONTENT_LENGTH': '1'
+ }, StringIO('x'), [], 'utf-8')
Please sign in to comment.
Something went wrong with that request. Please try again.