diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 02:28:35 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 02:28:35 +0000 |
commit | a4dba495753dd30492721cee621c75655ba3ff73 (patch) | |
tree | f8b7d54cce80b4cdc05de9e159a4931c998a17d6 | |
parent | eece2be9fdee5b1ed963149f7732d232652ef519 (diff) |
merges r30364 from trunk into ruby_1_9_2. Fixes #4377.
--
* io.c (pipe_open): Added rb_thread_atfork(). We must reinitialize
GVL at new process creation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Dec 25 20:01:40 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * io.c (pipe_open): Added rb_thread_atfork(). We must reinitialize + GVL at new process creation. + Sat Feb 5 10:09:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * load.c (rb_get_expanded_load_path): always expand load paths. @@ -5018,6 +5018,7 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode, fflush(stdin); /* is it really needed? */ pid = rb_fork(&status, 0, 0, Qnil); if (pid == 0) { /* child */ + rb_thread_atfork(); popen_redirect(&arg); rb_io_synchronized(RFILE(orig_stdout)->fptr); rb_io_synchronized(RFILE(orig_stderr)->fptr); @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 265 +#define RUBY_PATCHLEVEL 266 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |