From 0f4f048fa5ff06438a4624bc1dc02aa458a79748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= <cf.natali@gmail.com>
Date: Mon, 13 Oct 2014 19:19:26 +0100
Subject: Issue #22435: Fix a file descriptor leak when SocketServer bind
 fails.

---
 Lib/socketserver.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Lib/socketserver.py')

diff --git a/Lib/socketserver.py b/Lib/socketserver.py
index 2f395fac24..73399115b6 100644
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -426,8 +426,12 @@ class TCPServer(BaseServer):
         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.
-- 
cgit v1.2.1