[Python-checkins] r80587 - in python/branches/py3k: Doc/library/http.client.rst Lib/http/client.py Lib/test/test_httplib.py Misc/NEWS

[senthil.kumaran]

Author: senthil.kumaran
Date: Wed Apr 28 19:39:48 2010
New Revision: 80587

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/http.client.rst
   python/branches/py3k/Lib/http/client.py
   python/branches/py3k/Lib/test/test_httplib.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/library/http.client.rst
==============================================================================
--- python/branches/py3k/Doc/library/http.client.rst	(original)
+++ python/branches/py3k/Doc/library/http.client.rst	Wed Apr 28 19:39:48 2010
@@ -521,6 +521,22 @@
    >>> 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

Modified: python/branches/py3k/Lib/http/client.py
==============================================================================
--- python/branches/py3k/Lib/http/client.py	(original)
+++ python/branches/py3k/Lib/http/client.py	Wed Apr 28 19:39:48 2010
@@ -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)
 

Modified: python/branches/py3k/Lib/test/test_httplib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_httplib.py	(original)
+++ python/branches/py3k/Lib/test/test_httplib.py	Wed Apr 28 19:39:48 2010
@@ -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')

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Wed Apr 28 19:39:48 2010
@@ -339,6 +339,9 @@
 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