commit f8d2c3cf5f62f0c259b2bf35c631353d22cf1d08
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Fri Mar 23 13:31:20 2018 -0700
committer GitHub <noreply@github.com> Fri Mar 23 13:31:20 2018 -0700
tree a688042ced2f3169b22ce2d414ab7abe8ed598b9
parent 67d3f8b85a5bc5e322f3a7d209ed3a800985c122

bpo-31639: Use threads in http.server module. (GH-5018)

(cherry picked from commit 8bcfa02e4b1b65634e526e197588bc600674c80b)

Co-authored-by: Julien Palard <julien@palard.fr>

Lib/http/server.py

diff --git a/Lib/http/server.py b/Lib/http/server.py
index 502bce0..a2726ab 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -83,7 +83,7 @@
 __version__ = "0.6"
 
 __all__ = [
-    "HTTPServer", "BaseHTTPRequestHandler",
+    "HTTPServer", "ThreadedHTTPServer", "BaseHTTPRequestHandler",
     "SimpleHTTPRequestHandler", "CGIHTTPRequestHandler",
 ]
 
@@ -140,6 +140,10 @@
         self.server_port = port
 
 
+class ThreadedHTTPServer(socketserver.ThreadingMixIn, HTTPServer):
+    daemon_threads = True
+
+
 class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
 
     """HTTP request handler base class.
@@ -1213,7 +1217,8 @@
 
 
 def test(HandlerClass=BaseHTTPRequestHandler,
-         ServerClass=HTTPServer, protocol="HTTP/1.0", port=8000, bind=""):
+         ServerClass=ThreadedHTTPServer,
+         protocol="HTTP/1.0", port=8000, bind=""):
     """Test the HTTP request handler class.
 
     This runs an HTTP server on port 8000 (or the port argument).