From: Senthil Kumaran Date: Sat, 21 Aug 2010 16:14:54 +0000 (+0000) Subject: Merged revisions 84234 via svnmerge from X-Git-Tag: v2.7.1rc1~380 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7575ee2d3bf00c9e5bd1391f95eef6cdd59c53a;p=thirdparty%2FPython%2Fcpython.git Merged revisions 84234 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84234 | senthil.kumaran | 2010-08-21 21:38:32 +0530 (Sat, 21 Aug 2010) | 3 lines Add info about HTTP/1.1 and Connection:Close header. ........ --- diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst index b8f22775364e..973c098eb2c7 100644 --- a/Doc/library/urllib2.rst +++ b/Doc/library/urllib2.rst @@ -31,7 +31,8 @@ The :mod:`urllib2` module defines the following functions: *data* parameter is provided. *data* should be a buffer in the standard :mimetype:`application/x-www-form-urlencoded` format. The :func:`urllib.urlencode` function takes a mapping or sequence of 2-tuples and - returns a string in this format. + returns a string in this format. urllib2 module sends HTTP/1.1 requests with + `Connection:close` header included. The optional *timeout* parameter specifies a timeout in seconds for blocking operations like the connection attempt (if not specified, the global default