summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-08-21 16:14:54 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-08-21 16:14:54 (GMT)
commitb7575ee2d3bf00c9e5bd1391f95eef6cdd59c53a (patch)
tree761da584c9349cf7efb97322d56d6fc2345debfb /Doc
parentfa8fa0caf4681b0d834121399d54588ae0a965cb (diff)
downloadcpython-b7575ee2d3bf00c9e5bd1391f95eef6cdd59c53a.zip
cpython-b7575ee2d3bf00c9e5bd1391f95eef6cdd59c53a.tar.gz
cpython-b7575ee2d3bf00c9e5bd1391f95eef6cdd59c53a.tar.bz2
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. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/urllib2.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
index b8f2277..973c098 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