summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-18 02:13:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-18 02:13:30 (GMT)
commit1130c7f6935bb5d5f75a4e6138efce2496cbc28f (patch)
tree1f0a4d434cdcec6d724d565f726a4e4cb86ebcd3 /Doc/library
parenta634433a0076355408a222a8b79bcc5854aa66bd (diff)
parent70e2847347f9b4fd579e23cf2e2f329aab1faa5d (diff)
downloadcpython-1130c7f6935bb5d5f75a4e6138efce2496cbc28f.zip
cpython-1130c7f6935bb5d5f75a4e6138efce2496cbc28f.tar.gz
cpython-1130c7f6935bb5d5f75a4e6138efce2496cbc28f.tar.bz2
merge 3.4 (#23410)
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/http.server.rst12
1 files changed, 12 insertions, 0 deletions
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index ec54643..1c3e202 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -64,6 +64,18 @@ of which this module provides three different variants:
Contains the server instance.
+ .. attribute:: close_connection
+
+ Boolean that should be set before :meth:`handle_one_request` returns,
+ indicating if another request may be expected, or if the connection should
+ be shut down.
+
+ .. attribute:: requestline
+
+ Contains the string representation of the HTTP request line. The
+ terminating CRLF is stripped. This attribute should be set by
+ :meth:`handle_one_request`. If no valid request line was processed, it
+ should be set to the empty string.
.. attribute:: command