diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-05-24 17:51:32 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-05-24 17:51:32 (GMT) |
| commit | abf22b405fb15835ac9e1a732dee624c1a6c805a (patch) | |
| tree | 3a436d2d525068c567fb40f5f352b9148b5ce0d0 /Lib | |
| parent | c7284122be9254a6e3b5471a933852b68692130b (diff) | |
| parent | e6a06217d2adedbe4a07ad007eb8c9e6c4150052 (diff) | |
| download | cpython-abf22b405fb15835ac9e1a732dee624c1a6c805a.zip cpython-abf22b405fb15835ac9e1a732dee624c1a6c805a.tar.gz cpython-abf22b405fb15835ac9e1a732dee624c1a6c805a.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/socketserver.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py index 1103f4b..7389608 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -555,13 +555,11 @@ class ForkingMixIn: try: self.finish_request(request, client_address) self.shutdown_request(request) - self.socket.close() os._exit(0) except: try: self.handle_error(request, client_address) self.shutdown_request(request) - self.socket.close() finally: os._exit(1) |