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/Doc/library/http.client.rst b/Doc/library/http.client.rst
index bc5042318a79627f874aa5658ba459862f13b226..17373a76849a36ab86887022ca77ec1c2093657e 100644 (file)
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -521,6 +521,22 @@ Here is an example session that uses the ``GET`` method::
    >>> data2 = r2.read()
    >>> conn.close()
 
+Here is an example session that uses ``HEAD`` method. Note that ``HEAD`` method
+never returns any data. ::
+
+
+   >>> import http.client
+   >>> conn = http.client.HTTPConnection("www.python.org")
+   >>> conn.request("HEAD","/index.html")
+   >>> res = conn.getresponse()
+   >>> print(res.status, res.reason)
+   200 OK
+   >>> data = res.read()
+   >>> print(len(data))
+   0
+   >>> data == b''
+   True
+
 Here is an example session that shows how to ``POST`` requests::
 
    >>> import http.client, urllib.parse

diff --git a/Lib/http/client.py b/Lib/http/client.py
index b9246fd3045baf291064b783e65b1f59cd6329e8..2ddb0148cc1b2c93141fcbb120d0e6b683d55922 100644 (file)
--- 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)
 

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 84e1f80fcea754f3548541be593b64317c331e7f..6b09e072e4948aac5fd9e88b0cea1629204e0091 100644 (file)
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -224,6 +224,23 @@ class BasicTest(TestCase):
             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')

diff --git a/Misc/NEWS b/Misc/NEWS
index 2aedcdb2841b5abac034168e64c34b1fdc3adf37..e83285aba4b79faa217d1de1f5b365de4005dc83 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -339,6 +339,9 @@ C-API
 Library
 -------
 
+- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked.
+  It should correctly return an empty response now.
+
 - Issue #8546: Reject None given as the buffering argument to _pyio.open.
 
 - Issue #8549: Fix compiling the _ssl extension under AIX.  Patch by