Skip to content

bpo-35017: Lib/socketserver, do not accept any request after shutdown #9952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 26, 2018
Merged

bpo-35017: Lib/socketserver, do not accept any request after shutdown #9952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57f0822
bpo-35017: `BaseServer` should not accept any request after shutdown …
beledouxdenis Oct 18, 2018
928be37
bpo-35017: remove the unit test as it's time-based
beledouxdenis Oct 25, 2018
b9fb425
bpo-35017: reword the news to represent the new behavior
beledouxdenis Oct 25, 2018
7992fb0
bpo-35017: reword inline comment to be shorter and cleaner
beledouxdenis Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Lib/socketserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@ def serve_forever(self, poll_interval=0.5):

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()

Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2018-10-26-00-11-21.bpo-35017.6Ez4Cv.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.