[Python-checkins] cpython (2.7): Issue #16298: In HTTPResponse.read(), close the socket when there is no
antoine.pitrou
python-checkins at python.org
Sat Dec 15 19:28:24 CET 2012
http://hg.python.org/cpython/rev/2186f7b99c28
changeset: 80858:2186f7b99c28
branch: 2.7
parent: 80850:e451901e6243
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/httplib.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/httplib.py b/Lib/httplib.py
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -565,6 +565,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
@@ -166,7 +166,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)
@@ -177,6 +177,19 @@
self.assertEqual(resp.read(2), '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 = httplib.HTTPResponse(sock)
+ resp.begin()
+ self.assertEqual(resp.read(2), 'Te')
+ self.assertFalse(resp.isclosed())
+ self.assertEqual(resp.read(2), 'xt')
+ self.assertEqual(resp.read(1), '')
+ 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
@@ -849,6 +849,7 @@
Paul Rubin
Sam Ruby
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
@@ -160,6 +160,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
More information about the Python-checkins
mailing list