summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2014-04-16 17:56:41 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2014-04-16 17:56:41 (GMT)
commitc3ac9af6d00ec9b5939a0ce31984113ddb9b0a9c (patch)
tree8f3eab75c0aa2a4915f7712d270848027d4f143b
parent94a5b663bf39a130fcd8b437aded6e7a7c396cff (diff)
parentcad2bf20c3c790cd3535742a46d5b116e07b7f43 (diff)
downloadcpython-c3ac9af6d00ec9b5939a0ce31984113ddb9b0a9c.zip
cpython-c3ac9af6d00ec9b5939a0ce31984113ddb9b0a9c.tar.gz
cpython-c3ac9af6d00ec9b5939a0ce31984113ddb9b0a9c.tar.bz2
merge 3.4
-rw-r--r--Doc/library/http.server.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index dd19fb4..0d8e7fe 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -81,7 +81,10 @@ of which this module provides three different variants:
Holds an instance of the class specified by the :attr:`MessageClass` class
variable. This instance parses and manages the headers in the HTTP
- request.
+ request. The :func:`~http.client.parse_headers` function from
+ :mod:`http.client` is used to parse the headers and it requires that the
+ HTTP request provide a valid :rfc:`2822` style header.
+
.. attribute:: rfile