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"
  ........
................

diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index 0b413277e057a93c8eacb652226fe53db798adbc..737ba15f0dba12cd13562dd4d53c533edc7a0eb0 100644 (file)
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -504,6 +504,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 1de34efda87d33d26eaff2e958de8b2f46b94eff..f9b74e49e5a1e0a5521f335c757e3fcc5952dbcd 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 37cda5d19be832ec72148633fabf9173518970f6..98db2b77e59bdf7e7f5f621d19250b28e3b081af 100644 (file)
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -219,6 +219,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 a67dcd360ed094d53b5fb80731b436e2e138d83b..55f4e7ac1e046a7f04d5f9f8f96853bd7f46ccfb 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked.
+  It should correctly return an empty response now.
+
 - Issue #8549: Fix compiling the _ssl extension under AIX.  Patch by
   Sridhar Ratnakumar.