Commit 32f650cf authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #14594 -- Corrected a problem introduced by r14394 whereby reading POST... 

Fixed #14594 -- Corrected a problem introduced by r14394 whereby reading 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
parent 1fc7c4ae

django/http/__init__.py

+11 −1
Original line number Diff line number Diff line
@@ -140,7 +140,17 @@ class HttpRequest(object): 
        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")

            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)