summaryrefslogtreecommitdiffstats
path: root/Lib/http
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-04-28 17:44:30 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-04-28 17:44:30 (GMT)
commit2682638ee143fdf6fb716221c31cabd10ebd5198 (patch)
tree90a715bc55bc0b9da4a2999c9995617bed4e864c /Lib/http
parent95ff5249334e1322a11f9063ea1aabe1c4a3326e (diff)
downloadcpython-2682638ee143fdf6fb716221c31cabd10ebd5198.zip
cpython-2682638ee143fdf6fb716221c31cabd10ebd5198.tar.gz
cpython-2682638ee143fdf6fb716221c31cabd10ebd5198.tar.bz2
Merged revisions 80587 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80587 | senthil.kumaran | 2010-04-28 23:09:48 +0530 (Wed, 28 Apr 2010) | 9 lines Merged revisions 80583 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80583 | senthil.kumaran | 2010-04-28 22:50:43 +0530 (Wed, 28 Apr 2010) | 3 lines Fixed Issue6312 - httplib fails with HEAD requests to pages with "transfer-encoding: chunked" ........ ................
Diffstat (limited to 'Lib/http')
-rw-r--r--Lib/http/client.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 1de34ef..f9b74e4 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -487,6 +487,9 @@ class HTTPResponse(io.RawIOBase):
if self.fp is None:
return b""
+ if self._method == "HEAD":
+ return b""
+
if self.chunked:
return self._read_chunked(amt)