(original) (raw)

changeset: 70334:0e56d79fa2ab parent: 70331:8f403199f999 parent: 70333:ccd59ba8145e user: Charles-François Natali neologix@free.fr date: Tue May 24 18:29:46 2011 +0200 files: Misc/NEWS description: Issue #5715: In socketserver, close the server socket in the child process. diff -r 8f403199f999 -r 0e56d79fa2ab Lib/socketserver.py --- a/Lib/socketserver.py Tue May 24 11:09:06 2011 -0500 +++ b/Lib/socketserver.py Tue May 24 18:29:46 2011 +0200 @@ -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 -r 8f403199f999 -r 0e56d79fa2ab Misc/NEWS --- a/Misc/NEWS Tue May 24 11:09:06 2011 -0500 +++ b/Misc/NEWS Tue May 24 18:29:46 2011 +0200 @@ -13,6 +13,8 @@ - Issue #12166: Move implementations of dir() specialized for various types into the __dir__() methods of those types. +- 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. /neologix@free.fr