[Python-checkins] cpython: Issue #13713: fix a regression in HTTP chunked reading after 806cfe39f729

Wed Jan 4 18:58:36 CET 2012

http://hg.python.org/cpython/rev/4b21f651eeee
changeset: 74271:4b21f651eeee
user: Antoine Pitrou <solipsis at pitrou.net>
date: Wed Jan 04 18:57:22 2012 +0100
summary:
 Issue #13713: fix a regression in HTTP chunked reading after 806cfe39f729
(originally issue #13464: Add a readinto() method to http.client.HTTPResponse)
files:
 Lib/http/client.py | 4 +-
 Lib/test/test_httplib.py | 64 +++++++++++++++++++++------
 2 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/Lib/http/client.py b/Lib/http/client.py
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -603,12 +603,12 @@
 if len(mvb) < chunk_left:
 n = self._safe_readinto(mvb)
 self.chunk_left = chunk_left - n
- return n
+ return total_bytes + n
 elif len(mvb) == chunk_left:
 n = self._safe_readinto(mvb)
 self._safe_read(2) # toss the CRLF at the end of the chunk
 self.chunk_left = None
- return n
+ return total_bytes + n
 else:
 temp_mvb = mvb[0:chunk_left]
 n = self._safe_readinto(temp_mvb)
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -293,15 +293,28 @@
 'Transfer-Encoding: chunked\r\n\r\n'
 'a\r\n'
 'hello worl\r\n'
- '1\r\n'
- 'd\r\n'
+ '3\r\n'
+ 'd! \r\n'
+ '8\r\n'
+ 'and now \r\n'
+ '22\r\n'
+ 'for something completely different\r\n'
 )
+ expected = b'hello world! and now for something completely different'
 sock = FakeSocket(chunked_start + '0\r\n')
 resp = client.HTTPResponse(sock, method="GET")
 resp.begin()
- self.assertEqual(resp.read(), b'hello world')
+ self.assertEqual(resp.read(), expected)
 resp.close()
 
+ # Various read sizes
+ for n in range(1, 12):
+ sock = FakeSocket(chunked_start + '0\r\n')
+ resp = client.HTTPResponse(sock, method="GET")
+ resp.begin()
+ self.assertEqual(resp.read(n) + resp.read(n) + resp.read(), expected)
+ resp.close()
+
 for x in ('', 'foo\r\n'):
 sock = FakeSocket(chunked_start + x)
 resp = client.HTTPResponse(sock, method="GET")
@@ -309,9 +322,10 @@
 try:
 resp.read()
 except client.IncompleteRead as i:
- self.assertEqual(i.partial, b'hello world')
- self.assertEqual(repr(i),'IncompleteRead(11 bytes read)')
- self.assertEqual(str(i),'IncompleteRead(11 bytes read)')
+ self.assertEqual(i.partial, expected)
+ expected_message = 'IncompleteRead(%d bytes read)' % len(expected)
+ self.assertEqual(repr(i), expected_message)
+ self.assertEqual(str(i), expected_message)
 else:
 self.fail('IncompleteRead expected')
 finally:
@@ -323,29 +337,49 @@
 'Transfer-Encoding: chunked\r\n\r\n'
 'a\r\n'
 'hello worl\r\n'
- '1\r\n'
- 'd\r\n'
+ '3\r\n'
+ 'd! \r\n'
+ '8\r\n'
+ 'and now \r\n'
+ '22\r\n'
+ 'for something completely different\r\n'
 )
+ expected = b'hello world! and now for something completely different'
+ nexpected = len(expected)
+ b = bytearray(128)
+
 sock = FakeSocket(chunked_start + '0\r\n')
 resp = client.HTTPResponse(sock, method="GET")
 resp.begin()
- b = bytearray(16)
 n = resp.readinto(b)
- self.assertEqual(b[:11], b'hello world')
- self.assertEqual(n, 11)
+ self.assertEqual(b[:nexpected], expected)
+ self.assertEqual(n, nexpected)
 resp.close()
 
+ # Various read sizes
+ for n in range(1, 12):
+ sock = FakeSocket(chunked_start + '0\r\n')
+ resp = client.HTTPResponse(sock, method="GET")
+ resp.begin()
+ m = memoryview(b)
+ i = resp.readinto(m[0:n])
+ i += resp.readinto(m[i:n + i])
+ i += resp.readinto(m[i:])
+ self.assertEqual(b[:nexpected], expected)
+ self.assertEqual(i, nexpected)
+ resp.close()
+
 for x in ('', 'foo\r\n'):
 sock = FakeSocket(chunked_start + x)
 resp = client.HTTPResponse(sock, method="GET")
 resp.begin()
 try:
- b = bytearray(16)
 n = resp.readinto(b)
 except client.IncompleteRead as i:
- self.assertEqual(i.partial, b'hello world')
- self.assertEqual(repr(i),'IncompleteRead(11 bytes read)')
- self.assertEqual(str(i),'IncompleteRead(11 bytes read)')
+ self.assertEqual(i.partial, expected)
+ expected_message = 'IncompleteRead(%d bytes read)' % len(expected)
+ self.assertEqual(repr(i), expected_message)
+ self.assertEqual(str(i), expected_message)
 else:
 self.fail('IncompleteRead expected')
 finally:
-- 
Repository URL: http://hg.python.org/cpython
