aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--thread_pthread.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dc1a58b55..8fc83b20fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 15 09:22:47 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread_pthread.c (gvl_init): Reset gvl.wait_yield explicitly when
+ fork()ing. Patch by Apollon Oikonomopoulos. Thanks!
+ [Bug #7693][ruby-core:51424]
+
Tue Jan 15 09:27:56 2013 Eric Hodel <drbrain@segment7.net>
* doc/syntax/calling_methods.rdoc (Receiver): Added :: as pointed out
diff --git a/thread_pthread.c b/thread_pthread.c
index d35092a70a..6c48224a87 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -155,6 +155,7 @@ gvl_init(rb_vm_t *vm)
vm->gvl.acquired = 0;
vm->gvl.waiting = 0;
vm->gvl.need_yield = 0;
+ vm->gvl.wait_yield = 0;
}
static void