From: Fred Drake <fdrake@acm.org>
Date: Thu, 6 Jul 2000 19:42:19 +0000 (+0000)
Subject: Fix bug #392, reported by Jonathan Giddy <jon@dstc.edu.au>:
X-Git-Tag: v2.0b1~1042
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49b0c3bafe8fd9818e73e3594e12a749f796eeb2;p=thirdparty%2FPython%2Fcpython.git

Fix bug #392, reported by Jonathan Giddy <jon@dstc.edu.au>:
In posixmodule.c:posix_fork, the function PyOS_AfterFork is called for
both the parent and the child, despite the docs stating that it should
be called in the new (child) process.

This causes problems in the parent since the forking thread becomes the
main thread according to the signal module.

Calling PyOS_AfterFork() only in the child fixes this.  Changed for both
fork() and forkpty().
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index d85b91cc0b49..eea797e940d2 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1755,7 +1755,8 @@ posix_fork(self, args)
 	pid = fork();
 	if (pid == -1)
 		return posix_error();
-	PyOS_AfterFork();
+	if (pid == 0)
+		PyOS_AfterFork();
 	return PyInt_FromLong((long)pid);
 }
 #endif
@@ -1814,7 +1815,8 @@ posix_forkpty(self, args)
 	pid = forkpty(&master_fd, NULL, NULL, NULL);
 	if (pid == -1)
 		return posix_error();
-	PyOS_AfterFork();
+	if (pid == 0)
+		PyOS_AfterFork();
 	return Py_BuildValue("(ii)", pid, master_fd);
 }
 #endif