[Python-checkins] cpython (3.2): Issue #16298: In HTTPResponse.read(), close the socket when there is no

Sat Dec 15 19:28:25 CET 2012

http://hg.python.org/cpython/rev/b47d342c449b
changeset: 80859:b47d342c449b
branch: 3.2
parent: 80851:5777ac884919
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sat Dec 15 19:11:54 2012 +0100
summary:
 Issue #16298: In HTTPResponse.read(), close the socket when there is no Content-Length and the incoming stream is finished.
Patch by Eran Rundstein.
files:
 Lib/http/client.py | 4 ++++
 Lib/test/test_httplib.py | 15 ++++++++++++++-
 Misc/ACKS | 1 +
 Misc/NEWS | 4 ++++
 4 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/Lib/http/client.py b/Lib/http/client.py
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -511,6 +511,10 @@
 self.length -= len(s)
 if not self.length:
 self.close()
+ else:
+ if not s:
+ self.close()
+
 return s
 
 def _read_chunked(self, amt):
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
@@ -175,7 +175,7 @@
 self.assertEqual(repr(exc), '''BadStatusLine("\'\'",)''')
 
 def test_partial_reads(self):
- # if we have a lenght, the system knows when to close itself
+ # if we have a length, the system knows when to close itself
 # same behaviour than when we read the whole thing with read()
 body = "HTTP/1.1 200 Ok\r\nContent-Length: 4\r\n\r\nText"
 sock = FakeSocket(body)
@@ -186,6 +186,19 @@
 self.assertEqual(resp.read(2), b'xt')
 self.assertTrue(resp.isclosed())
 
+ def test_partial_reads_no_content_length(self):
+ # when no length is present, the socket should be gracefully closed when
+ # all data was read
+ body = "HTTP/1.1 200 Ok\r\n\r\nText"
+ sock = FakeSocket(body)
+ resp = client.HTTPResponse(sock)
+ resp.begin()
+ self.assertEqual(resp.read(2), b'Te')
+ self.assertFalse(resp.isclosed())
+ self.assertEqual(resp.read(2), b'xt')
+ self.assertEqual(resp.read(1), b'')
+ self.assertTrue(resp.isclosed())
+
 def test_host_port(self):
 # Check invalid host_port
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -917,6 +917,7 @@
 Sam Ruby
 Demur Rumed
 Audun S. Runde
+Eran Rundstein
 Rauli Ruohonen
 Jeff Rush
 Sam Rushing
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -179,6 +179,10 @@
 Library
 -------
 
+- Issue #16298: In HTTPResponse.read(), close the socket when there is no
+ Content-Length and the incoming stream is finished. Patch by Eran
+ Rundstein.
+
 - Issue #16248: Disable code execution from the user's home directory by
 tkinter when the -E flag is passed to Python. Patch by Zachary Ware.
 
-- 
Repository URL: http://hg.python.org/cpython
