summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Palard <julien@palard.fr>2018-03-28 23:24:58 +0200
committerGitHub <noreply@github.com>2018-03-28 23:24:58 +0200
commit79c3bab35cce55e6d175aff96a845bc6d932b203 (patch)
treef0cf3b738042966f98c35f5a3d09e55bccef58db
parent78553138be3b38d361bded8e641a2a4fd65a9d16 (diff)
downloadcpython-git-79c3bab35cce55e6d175aff96a845bc6d932b203.tar.gz
FIX documentation and NEWS of ThreadedHTTPServer. (GH-6207)
-rw-r--r--Doc/library/http.server.rst7
-rw-r--r--Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst2
2 files changed, 6 insertions, 3 deletions
diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 4fe46cba69..278ae55375 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -37,8 +37,11 @@ handler. Code to create and run the server looks like this::
This class is identical to HTTPServer but uses threads to handle
requests by using the :class:`~socketserver.ThreadingMixin`. This
- is usefull to handle web browsers pre-opening sockets, on which
- :class:`HTTPServer` would wait indefinitly.
+ is useful to handle web browsers pre-opening sockets, on which
+ :class:`HTTPServer` would wait indefinitely.
+
+ .. versionadded:: 3.7
+
The :class:`HTTPServer` and :class:`ThreadedHTTPServer` must be given
a *RequestHandlerClass* on instantiation, of which this module
diff --git a/Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst b/Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst
index e876f40813..581ac8266b 100644
--- a/Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst
+++ b/Misc/NEWS.d/next/Library/2017-12-27-21-55-19.bpo-31639.l3avDJ.rst
@@ -1,2 +1,2 @@
http.server now exposes a ThreadedHTTPServer class and uses it when the
-module is invoked to cope with web browsers pre-opening sockets.
+module is run with ``-m`` to cope with web browsers pre-opening sockets.