diff -r ec12fbf449a5 Lib/socketserver.py --- a/Lib/socketserver.py Mon Feb 08 17:57:22 2016 +0200 +++ b/Lib/socketserver.py Mon Feb 15 18:21:34 2016 +0200 @@ -319,6 +319,8 @@ except: self.handle_error(request, client_address) self.shutdown_request(request) + else: + self.shutdown_request(request) def handle_timeout(self): """Called if no new request arrives within self.timeout. diff -r ec12fbf449a5 Lib/test/test_socketserver.py --- a/Lib/test/test_socketserver.py Mon Feb 08 17:57:22 2016 +0200 +++ b/Lib/test/test_socketserver.py Mon Feb 15 18:21:34 2016 +0200 @@ -280,6 +280,30 @@ socketserver.TCPServer((HOST, -1), socketserver.StreamRequestHandler) + def test_shutdown_request_called_if_verify_request_false(self): + # Issue #26309: BaseServer should call shutdown_request even if + # verify_request is False + shutdown_called = False + + class MyServer(socketserver.TCPServer): + def verify_request(self, request, client_address): + return False + + def shutdown_request(self, request): + nonlocal shutdown_called + shutdown_called = True + super().shutdown_request(request) + + def connect_to_server(proto, addr): + s = socket.socket(proto, socket.SOCK_STREAM) + s.connect(addr) + s.close() + + self.run_server(MyServer, + socketserver.StreamRequestHandler, + connect_to_server) + self.assertEqual(shutdown_called, True) + class MiscTestCase(unittest.TestCase):