mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #15633: httplib.HTTPResponse is now mark closed when the server sends less than the advertised Content-Length.

Browse source
This commit is contained in:
Antoine Pitrou 2013-02-02 23:04:56 +01:00
commit 6a35e18161
3 changed files with 47 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/http/client.py
View file

@ -507,7 +507,11 @@ class HTTPResponse(io.RawIOBase):
if self.length is None:
s = self.fp.read()
else:
s = self._safe_read(self.length)
try:
s = self._safe_read(self.length)
except IncompleteRead:
self.close()
raise
self.length = 0
self.close() # we read everything
return s
@ -532,13 +536,14 @@ class HTTPResponse(io.RawIOBase):
# connection, and the user is reading more bytes than will be provided
# (for example, reading in 1k chunks)
n = self.fp.readinto(b)
if self.length is not None:
if not n:
# Ideally, we would raise IncompleteRead if the content-length
# wasn't satisfied, but it might break compatibility.
self.close()
elif self.length is not None:
self.length -= n
if not self.length:
self.close()
else:
if not n:
self.close()
return n
def _read_next_chunk_size(self):