mirror of
https://github.com/python/cpython.git
synced 2025-07-12 13:55:34 +00:00
Issue #15633: httplib.HTTPResponse is now mark closed when the server sends less than the advertised Content-Length.
This commit is contained in:
parent
6375257188
commit
beec61ae4e
3 changed files with 27 additions and 4 deletions
|
@ -493,7 +493,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
|
||||
|
@ -507,6 +511,10 @@ class HTTPResponse(io.RawIOBase):
|
|||
# connection, and the user is reading more bytes than will be provided
|
||||
# (for example, reading in 1k chunks)
|
||||
s = self.fp.read(amt)
|
||||
if not s:
|
||||
# Ideally, we would raise IncompleteRead if the content-length
|
||||
# wasn't satisfied, but it might break compatibility.
|
||||
self.close()
|
||||
if self.length is not None:
|
||||
self.length -= len(s)
|
||||
if not self.length:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue