[Python-checkins] cpython (merge 3.1 -> 3.2): Issue #5715: In socketserver, close the server socket in the child process.

[charles-francois.natali]

http://hg.python.org/cpython/rev/ccd59ba8145e
changeset:   70333:ccd59ba8145e
branch:      3.2
parent:      70319:396f4ed61db7
parent:      70332:f13c06b777a7
user:        Charles-François Natali <neologix at free.fr>
date:        Tue May 24 18:27:25 2011 +0200
summary:
  Issue #5715: In socketserver, close the server socket in the child process.

files:
  Lib/socketserver.py |  2 +-
  Misc/NEWS           |  2 ++
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/socketserver.py b/Lib/socketserver.py
--- a/Lib/socketserver.py
+++ b/Lib/socketserver.py
@@ -549,10 +549,10 @@
                 self.active_children = []
             self.active_children.append(pid)
             self.close_request(request)
-            return
         else:
             # Child process.
             # This must never return, hence os._exit()!
+            self.socket.close()
             try:
                 self.finish_request(request, client_address)
                 self.shutdown_request(request)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,8 @@
 Library
 -------
 
+- Issue #5715: In socketserver, close the server socket in the child process.
+
 - Correct lookup of __dir__ on objects. Among other things, this causes errors
   besides AttributeError found on lookup to be propagated.
 

-- 
Repository URL: http://hg.python.org/cpython