Ticket #3496: wsgi_patch2.diff

django/core/handlers/wsgi.py

@@ -160 +160 @@
             try:
                 # CONTENT_LENGTH might be absent if POST doesn't have content at all (lighttpd)
                 content_length = int(self.environ.get('CONTENT_LENGTH', 0))
+                has_content_length = True
             except ValueError: # if CONTENT_LENGTH was empty string or not an integer
                 content_length = 0
-            safe_copyfileobj(self.environ['wsgi.input'], buf, size=content_length)
-            self._raw_post_data = buf.getvalue()
+                has_content_length = False
+
+            if has_content_length and content_length == 0:
+                # Empty HTML forms do post a content length, but with a length of 0.
+                # Socket read doesn't return with a size of 0. See #3496.
+                pass
+            else:
+                safe_copyfileobj(self.environ['wsgi.input'], buf, size=content_length)
+
+            self._raw_post_data = buf.getvalue()
             buf.close()
             return self._raw_post_data