Issue #26309: Merge socketserver fix from 3.5

2 files changed, 26 insertions, 0 deletions

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index e16aca5..1524d16 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -319,6 +319,8 @@ class BaseServer:
             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 --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 1ea66a6..f8f7762 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -280,6 +280,30 @@ class SocketServerTest(unittest.TestCase):
                 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):