diff options
| author | Tim Graham <timograham@gmail.com> | 2016-08-03 12:46:57 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-08-03 14:01:08 -0400 |
| commit | dcebeea2703322bc53c511bf3cff9e3c2e04d802 (patch) | |
| tree | 3985a8cf6eac12c37327ba97ddaff507b8e3bb83 | |
| parent | 348406c381f8f574bcc4c74c62279060010ae35f (diff) | |
[1.10.x] Fixed #27005 -- Fixed crash if request.META[''CONTENT_LENGTH']=''.
Backport of 5c63b3e5a797102d915e1683971517f747a28013 from master
| -rw-r--r-- | django/http/request.py | 2 | ||||
| -rw-r--r-- | docs/releases/1.10.1.txt | 3 | ||||
| -rw-r--r-- | tests/requests/test_data_upload_settings.py | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/django/http/request.py b/django/http/request.py index f3754ba2ff..0ea423d080 100644 --- a/django/http/request.py +++ b/django/http/request.py @@ -264,7 +264,7 @@ class HttpRequest(object): # Limit the maximum request data size that will be handled in-memory. if (settings.DATA_UPLOAD_MAX_MEMORY_SIZE is not None and - int(self.META.get('CONTENT_LENGTH', 0)) > settings.DATA_UPLOAD_MAX_MEMORY_SIZE): + int(self.META.get('CONTENT_LENGTH') or 0) > settings.DATA_UPLOAD_MAX_MEMORY_SIZE): raise RequestDataTooBig('Request body exceeded settings.DATA_UPLOAD_MAX_MEMORY_SIZE.') try: diff --git a/docs/releases/1.10.1.txt b/docs/releases/1.10.1.txt index 58619492a7..d5bfcac2bd 100644 --- a/docs/releases/1.10.1.txt +++ b/docs/releases/1.10.1.txt @@ -23,3 +23,6 @@ Bugfixes * Fixed a regression in the number of queries when using ``RadioSelect`` with a ``ModelChoiceField`` form field (:ticket:`27001`). + +* Fixed a crash if ``request.META['CONTENT_LENGTH']`` is an empty string + (:ticket:`27005`). diff --git a/tests/requests/test_data_upload_settings.py b/tests/requests/test_data_upload_settings.py index 8855e13336..f60f1850ea 100644 --- a/tests/requests/test_data_upload_settings.py +++ b/tests/requests/test_data_upload_settings.py @@ -104,6 +104,10 @@ class DataUploadMaxMemorySizeGetTests(SimpleTestCase): with self.settings(DATA_UPLOAD_MAX_MEMORY_SIZE=None): self.request.body + def test_empty_content_length(self): + self.request.environ['CONTENT_LENGTH'] = '' + self.request.body + class DataUploadMaxNumberOfFieldsGet(SimpleTestCase): |