From 566e284c565a9ea95d81756c6b1f94dfa63fc61b Mon Sep 17 00:00:00 2001
From: Senko Rasic <senko.rasic@dobarkod.hr>
Date: Sat, 18 May 2013 12:26:38 +0200
Subject: [PATCH] Added test for multipart, non form-data POST.

Closes #9054. The bug itself is no longer present.
---
 tests/requests/tests.py | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/tests/requests/tests.py b/tests/requests/tests.py
index daf426ea47..56d58c4c75 100644
--- a/tests/requests/tests.py
+++ b/tests/requests/tests.py
@@ -503,9 +503,9 @@ class RequestsTests(SimpleTestCase):
         })
         self.assertEqual(request.POST, {'key': ['España']})
 
-    def test_body_after_POST_multipart(self):
+    def test_body_after_POST_multipart_form_data(self):
         """
-        Reading body after parsing multipart is not allowed
+        Reading body after parsing multipart/form-data is not allowed
         """
         # Because multipart is used for large amounts fo data i.e. file uploads,
         # we don't want the data held in memory twice, and we don't want to
@@ -524,6 +524,29 @@ class RequestsTests(SimpleTestCase):
         self.assertEqual(request.POST, {'name': ['value']})
         self.assertRaises(Exception, lambda: request.body)
 
+    def test_body_after_POST_multipart_related(self):
+        """
+        Reading body after parsing multipart that isn't form-data is allowed
+        """
+        # Ticket #9054
+        # There are cases in which the multipart data is related instead of
+        # being a binary upload, in which case it should still be accessible
+        # via body.
+        payload_data = "\r\n".join([
+                '--boundary',
+                'Content-ID: id; name="name"',
+                '',
+                'value',
+                '--boundary--'
+                ''])
+        payload = FakePayload(payload_data)
+        request = WSGIRequest({'REQUEST_METHOD': 'POST',
+                               'CONTENT_TYPE': 'multipart/related; boundary=boundary',
+                               'CONTENT_LENGTH': len(payload),
+                               'wsgi.input': payload})
+        self.assertEqual(request.POST, {})
+        self.assertEqual(request.body, payload_data)
+
     def test_POST_multipart_with_content_length_zero(self):
         """
         Multipart POST requests with Content-Length >= 0 are valid and need to be handled.