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"
........
diff --git a/Lib/http/client.py b/Lib/http/client.py
index b9246fd..2ddb014 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -487,6 +487,9 @@
if self.fp is None:
return b""
+ if self._method == "HEAD":
+ return b""
+
if self.chunked:
return self._read_chunked(amt)
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 84e1f80..6b09e07 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -224,6 +224,23 @@
finally:
resp.close()
+ def test_chunked_head(self):
+ chunked_start = (
+ 'HTTP/1.1 200 OK\r\n'
+ 'Transfer-Encoding: chunked\r\n\r\n'
+ 'a\r\n'
+ 'hello world\r\n'
+ '1\r\n'
+ 'd\r\n'
+ )
+ sock = FakeSocket(chunked_start + '0\r\n')
+ resp = client.HTTPResponse(sock, method="HEAD")
+ resp.begin()
+ self.assertEquals(resp.read(), b'')
+ self.assertEquals(resp.status, 200)
+ self.assertEquals(resp.reason, 'OK')
+ resp.close()
+
def test_negative_content_length(self):
sock = FakeSocket(
'HTTP/1.1 200 OK\r\nContent-Length: -1\r\n\r\nHello\r\n')