summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-08 03:58:37 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-08 03:58:37 +0000
commitcbf33c59ded17f32783954a2226df63af9089504 (patch)
tree9351c61407b8f9ea61bbf99e9d55c8b82f3c4dd7 /ChangeLog
parentab5865409e9a0392e990e0cda681aef3f8585da0 (diff)
merge revision(s) 26371,26373,26374,26972:
* eval.c (thread_timer, rb_thread_stop_timer): check the timing of stopping timer. patch from KOSAKI Motohiro <kosaki.motohiro _AT_ jp.fujitsu.com> * eval.c (rb_thread_start_timer): NetBSD5 seems to be hung when calling pthread_create() from pthread_atfork()'s parent handler. * io.c (pipe_open): workaround for NetBSD5. stop timer thread before fork(), and start it if needed. * process.c (rb_f_fork, rb_f_system): ditto. fixed [ruby-dev:40074] jp.fujitsu.com> via IRC. fork(), and restart it after fork() on parent, and on child if needed. these changes are tested by naruse. fixed [ruby-dev:40074] * io.c, eval.c, process.c: add linux to r26371's condition. patched by Motohiro KOSAKI [ruby-core:28151] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog22
1 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 38d708ddae..f462cf9c8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Tue Jun 8 12:37:56 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * io.c, eval.c, process.c: add linux to r26371's condition.
+ patched by Motohiro KOSAKI [ruby-core:28151]
+
+Tue Jun 8 12:37:56 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * eval.c (thread_timer, rb_thread_stop_timer): check the timing of
+ stopping timer. patch from KOSAKI Motohiro <kosaki.motohiro _AT_
+ jp.fujitsu.com> via IRC.
+
+ * eval.c (rb_thread_start_timer): NetBSD5 seems to be hung when calling
+ pthread_create() from pthread_atfork()'s parent handler.
+
+ * io.c (pipe_open): workaround for NetBSD5. stop timer thread before
+ fork(), and restart it after fork() on parent, and on child if
+ needed.
+
+ * process.c (rb_f_fork, rb_f_system): ditto.
+
+ these changes are tested by naruse. fixed [ruby-dev:40074]
+
Mon Jun 7 19:23:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c (numchar_getc): get rid of buffer