diff -r ca0aa0d89273 Lib/socketserver.py --- a/Lib/socketserver.py Thu Sep 18 23:18:46 2014 +0100 +++ b/Lib/socketserver.py Fri Sep 19 22:18:28 2014 +0100 @@ -439,8 +439,12 @@ self.socket = socket.socket(self.address_family, self.socket_type) if bind_and_activate: - self.server_bind() - self.server_activate() + try: + self.server_bind() + self.server_activate() + except: + self.server_close() + raise def server_bind(self): """Called by constructor to bind the socket. diff -r ca0aa0d89273 Lib/test/test_socketserver.py --- a/Lib/test/test_socketserver.py Thu Sep 18 23:18:46 2014 +0100 +++ b/Lib/test/test_socketserver.py Fri Sep 19 22:18:28 2014 +0100 @@ -270,6 +270,16 @@ t.join() s.server_close() + def test_tcpserver_bind_leak(self): + # Issue #22435: the server socket wouldn't be closed if bind()/listen() + # failed. + # Create many servers for which bind() will fail, to see if this result + # in FD exhaustion. + for i in range(1024): + with self.assertRaises(OverflowError): + socketserver.TCPServer((HOST, -1), + socketserver.StreamRequestHandler) + def test_main(): if imp.lock_held():