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"
  ........
................
This commit is contained in:
Senthil Kumaran 2010-04-28 17:44:30 +00:00
parent 95ff524933
commit 2682638ee1
4 changed files with 39 additions and 0 deletions

View File

@ -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

View File

@ -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)

View File

@ -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')

View File

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