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/httplib.rst b/Doc/library/httplib.rst
index e48c95c732d281a35d7d508b770596d1b93e2e75..da2169cd5807189a6ef2a5a7b2e757daad6dd8fd 100644 (file)
--- a/Doc/library/httplib.rst
+++ b/Doc/library/httplib.rst
@@ -541,6 +541,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 httplib
+   >>> conn = httplib.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 == ''
+   True
+
 Here is an example session that shows how to ``POST`` requests::
 
    >>> import httplib, urllib

diff --git a/Lib/httplib.py b/Lib/httplib.py
index e5ef8b7edc67d0f7e3dca41320987d20b04f4f23..262d60259c22858608ee26041327b06a88d1f97f 100644 (file)
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -514,6 +514,9 @@ class HTTPResponse:
         if self.fp is None:
             return ''
 
+        if self._method == 'HEAD':
+            return ''
+
         if self.chunked:
             return self._read_chunked(amt)
 

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 252834b85629a03815a7d00469242b39d0b2ed73..cc3f590b03a5108b1381d5cf6fa70514bb6e8b9b 100644 (file)
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -207,6 +207,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 = httplib.HTTPResponse(sock, method="HEAD")
+        resp.begin()
+        self.assertEquals(resp.read(), '')
+        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\n'
                           'Content-Length: -1\r\n\r\nHello\r\n')

diff --git a/Misc/NEWS b/Misc/NEWS
index ff75f2f5137f993d0e2b969551728cb70fd33e00..0bd215f18771bc7186648cf5cd4a0924f0fa4f07 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,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 #8086: In :func:`ssl.DER_cert_to_PEM_cert()`, fix missing newline
   before the certificate footer.  Patch by Kyle VanderBeek.