cpython: 0e56d79fa2ab (original) (raw)

Mercurial > cpython

changeset 70334:0e56d79fa2ab

Issue #5715: In socketserver, close the server socket in the child process. [#5715]

Charles-François Natali neologix@free.fr
date	Tue, 24 May 2011 18:29:46 +0200
parents	8f403199f999(current diff)ccd59ba8145e(diff)
children	5dbec17745fa
files	Misc/NEWS
diffstat	2 files changed, 3 insertions(+), 1 deletions(-)[+] [-] Lib/socketserver.py 2 Misc/NEWS 2

line wrap: on

line diff

--- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -549,10 +549,10 @@ class ForkingMixIn: self.active_children = [] self.active_children.append(pid) self.close_request(request)

       return[](#l1.7)
   else:[](#l1.8)
       # Child process.[](#l1.9)
       # This must never return, hence os._exit()![](#l1.10)

       self.socket.close()[](#l1.11)
       try:[](#l1.12)
           self.finish_request(request, client_address)[](#l1.13)
           self.shutdown_request(request)[](#l1.14)

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,8 @@ Core and Builtins

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.