From: Denis Ledoux <be.ledoux.denis@gmail.com>
Date: Fri, 26 Oct 2018 13:46:17 +0000 (+0200)
Subject: bpo-35017, socketserver: don't accept request after shutdown (GH-9952)
X-Git-Tag: v3.8.0a1~666
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10cb3760e8631a27f5db1e51b05494e29306c671;p=thirdparty%2FPython%2Fcpython.git

bpo-35017, socketserver: don't accept request after shutdown (GH-9952)

Prior to this revision, after the shutdown of a `BaseServer`,
the server accepted a last single request
if it was sent between the server socket polling
and the polling timeout.

This can be problematic for instance for a server restart
for which you do not want to interrupt the service,
by not closing the listening socket during the restart.
One request failed because of this behavior.

Note that only one request failed,
following requests were not accepted, as expected.
---

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 9dfd21bab9b6..f0377918e894 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -230,6 +230,9 @@ class BaseServer:
 
                 while not self.__shutdown_request:
                     ready = selector.select(poll_interval)
+                    # bpo-35017: shutdown() called during select(), exit immediately.
+                    if self.__shutdown_request:
+                        break
                     if ready:
                         self._handle_request_noblock()
 
diff --git a/Misc/NEWS.d/next/Library/2018-10-26-00-11-21.bpo-35017.6Ez4Cv.rst b/Misc/NEWS.d/next/Library/2018-10-26-00-11-21.bpo-35017.6Ez4Cv.rst
new file mode 100644
index 000000000000..5682717adf70
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-10-26-00-11-21.bpo-35017.6Ez4Cv.rst
@@ -0,0 +1,3 @@
+:meth:`socketserver.BaseServer.serve_forever` now exits immediately if it's
+:meth:`~socketserver.BaseServer.shutdown` method is called while it is
+polling for new events.