Ticket #15018: test_and_fix_for_ticket_15018.diff

django/core/handlers/wsgi.py

@@ -96 +96 @@
         return result
 
     def readline(self, size=None):
-        while '\n' not in self.buffer or \
-              (size is not None and len(self.buffer) < size):
+        while '\n' not in self.buffer and \
+              (size is None or len(self.buffer) < size):
             if size:
+                # since size is not None here, len(self.buffer) < size
                 chunk = self._read_limited(size - len(self.buffer))
             else:
                 chunk = self._read_limited()

tests/regressiontests/requests/tests.py

@@ -129 +129 @@
         # Read everything else.
         self.assertEqual(stream.readline(), 'ijkl')
 
+    def test_limited_stream_ticket_15018(self):
+        stream = LimitedStream(StringIO('\nabc'), 3)
+        self.assertEqual(stream.readline(3), '\n')
+        self.assertEqual(stream.readline(1), 'a')
+        self.assertEqual(stream.readline(1), 'b')
+        # Hit stream limit
+        self.assertEqual(stream.readline(1), '')
+
     def test_stream(self):
         request = WSGIRequest({'REQUEST_METHOD': 'POST', 'wsgi.input': StringIO('name=value')})
         self.assertEqual(request.read(), 'name=value')