From: Richard Oudkerk <shibturn@gmail.com>
Date: Wed, 1 Aug 2012 16:44:18 +0000 (+0100)
Subject: Issue #15525: Increase timeout when TerminateProcess() fails
X-Git-Tag: v3.3.0b2~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b303580c7c9b1b5579ec6422773c2874d7a24274;p=thirdparty%2FPython%2Fcpython.git

Issue #15525: Increase timeout when TerminateProcess() fails
---

diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
index 4baf5486c0f3..3beb81659354 100644
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -273,8 +273,8 @@ else:
             if self.returncode is None:
                 try:
                     _winapi.TerminateProcess(int(self._handle), TERMINATE)
-                except WindowsError:
-                    if self.wait(timeout=0.1) is None:
+                except OSError:
+                    if self.wait(timeout=1.0) is None:
                         raise
 
     #