Index: Modules/signalmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/signalmodule.c,v
retrieving revision 2.53
diff -c -r2.53 signalmodule.c
*** Modules/signalmodule.c	2000/08/03 02:34:44	2.53
--- Modules/signalmodule.c	2000/08/19 04:28:23
***************
*** 667,672 ****
--- 667,673 ----
  PyOS_AfterFork(void)
  {
  #ifdef WITH_THREAD
+ 	PyEval_ReInitThreads();
  	main_thread = PyThread_get_thread_ident();
  	main_pid = getpid();
  #endif
Index: Parser/intrcheck.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Parser/intrcheck.c,v
retrieving revision 2.39
diff -c -r2.39 intrcheck.c
*** Parser/intrcheck.c	2000/07/31 15:28:04	2.39
--- Parser/intrcheck.c	2000/08/19 04:28:24
***************
*** 206,209 ****
--- 206,212 ----
  void
  PyOS_AfterFork(void)
  {
+ #ifdef WITH_THREAD
+ 	PyEval_ReInitThreads();
+ #endif
  }
Index: Python/ceval.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/ceval.c,v
retrieving revision 2.191
diff -c -r2.191 ceval.c
*** Python/ceval.c	2000/08/18 19:53:25	2.191
--- Python/ceval.c	2000/08/19 04:28:37
***************
*** 142,147 ****
--- 142,165 ----
  		Py_FatalError("PyEval_ReleaseThread: wrong thread state");
  	PyThread_release_lock(interpreter_lock);
  }
+ 
+ /* This function is called from PyOS_AfterFork to ensure that newly
+    created child processes don't hold locks referring to threads which
+    are not running in the child process.  (This could also be done using
+    pthread_atfork mechanism, at least for the pthreads implementation) */
+ void
+ PyEval_ReInitThreads(void)
+ {
+ 	if (!interpreter_lock)
+ 		return;
+ 	/*XXX Can't use PyThread_free_lock here because it does too
+ 	  much error-checking.  Doing this cleanly would require
+ 	  adding a new function to each thread_*.h.  Instead, just
+ 	  create a new lock and waste a little bit of memory */
+ 	interpreter_lock = PyThread_allocate_lock();
+ 	PyThread_acquire_lock(interpreter_lock, 1);
+ 	main_thread = PyThread_get_thread_ident();
+ }
  #endif
  
  /* Functions save_thread and restore_thread are always defined so