Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #14594 -- Corrected a problem introduced by r14394 whereby read…

…ing POST data when running a WSGI server under CherryPy would hang. Thanks to Mark Sundstrom for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 32f650cfccec3a07e6c1fd18e58284101dc83a2d 1 parent 1fc7c4a
@freakboy3742 freakboy3742 authored
Showing with 11 additions and 1 deletion.
  1. +11 −1 django/http/__init__.py
View
12 django/http/__init__.py
@@ -140,7 +140,17 @@ def _get_raw_post_data(self):
if not hasattr(self, '_raw_post_data'):
if self._read_started:
raise Exception("You cannot access raw_post_data after reading from request's data stream")
- self._raw_post_data = self.read()
+ try:
+ content_length = int(self.META.get('CONTENT_LENGTH', 0))
+ except (ValueError, TypeError):
+ # If CONTENT_LENGTH was empty string or not an integer, don't
+ # error out. We've also seen None passed in here (against all
+ # specs, but see ticket #8259), so we handle TypeError as well.
+ content_length = 0
+ if content_length:
+ self._raw_post_data = self.read()
+ else:
+ self._raw_post_data = self.read(int(content_length))
self._stream = StringIO(self._raw_post_data)
return self._raw_post_data
raw_post_data = property(_get_raw_post_data)
Please sign in to comment.
Something went wrong with that request. Please try again.