Ticket #12522: raw_post.diff

django/core/handlers/modpython.py

@@ -1 +1 @@
 import os
 from pprint import pformat
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
 
 from django import http
 from django.core import signals
@@ -82 +86 @@
             return
 
         if 'content-type' in self._req.headers_in and self._req.headers_in['content-type'].startswith('multipart'):
-            self._raw_post_data = ''
             try:
-                self._post, self._files = self.parse_file_upload(self.META, self._req)
+                self._post, self._files = self.parse_file_upload(self.META, StringIO(self.raw_post_data))
             except:
                 # See django.core.handlers.wsgi.WSGIHandler for an explanation
                 # of what's going on here.

django/core/handlers/wsgi.py

@@ -132 +132 @@
         # Populates self._post and self._files
         if self.method == 'POST':
             if self.environ.get('CONTENT_TYPE', '').startswith('multipart'):
-                self._raw_post_data = ''
+                body = StringIO(self.raw_post_data)
                 try:
-                    self._post, self._files = self.parse_file_upload(self.META, self.environ['wsgi.input'])
+                    self._post, self._files = self.parse_file_upload(self.META, body)
                 except:
                     # An error occured while parsing POST data.  Since when
                     # formatting the error the request handler might access

tests/regressiontests/requests/tests.py

@@ -44 +44 @@
 >>> request.path = ''
 >>> print request.build_absolute_uri(location="/path/with:colons")
 http://www.example.com/path/with:colons
+
+>>> from django.core.handlers.wsgi import WSGIRequest
+>>> from django.test.client import MULTIPART_CONTENT, BOUNDARY, FakePayload, encode_multipart
+>>> post_data = encode_multipart(BOUNDARY,dict(testkey="testvalue"))
+>>> env =  {'SERVER_PROTOCOL': 'HTTP/1.0','REQUEST_METHOD':'POST','wsgi.input':FakePayload(post_data),'CONTENT_TYPE':MULTIPART_CONTENT,'CONTENT_LENGTH':len(post_data)}
+>>> req = WSGIRequest(env)
+>>> nop = req.raw_post_data   #acessing the raw data
+>>> print req.POST['testkey'] #after acessing raw data POST still should be accesible
+testvalue
+
+>>> from django.core.handlers.wsgi import WSGIRequest
+>>> from django.test.client import MULTIPART_CONTENT, BOUNDARY, FakePayload, encode_multipart
+>>> post_data = encode_multipart(BOUNDARY,dict(testkey="testvalue"))
+>>> env =  {'SERVER_PROTOCOL': 'HTTP/1.0','REQUEST_METHOD':'POST','wsgi.input':FakePayload(post_data),'CONTENT_TYPE':MULTIPART_CONTENT,'CONTENT_LENGTH':len(post_data)}
+>>> req = WSGIRequest(env)
+>>> nop = req.POST['testkey'] #acessing POST keys
+>>> len(req.raw_post_data) == len(post_data)   #after that raw_post_data should still be non empty
+True
 """
+