archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r30350 from trunk into ruby_1_9_2.

Browse source 
--
    * ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
      We must reinitialize GVL when new process creation. Otherwise
      we may meet an insane deadlock. [Bug #4121][ruby-dev:42686]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-12-25 09:37:26 +00:00
parent 5be97645b4
commit 6223c55b57
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Dec 25 15:08:08 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
We must reinitialize GVL at new process creation. Otherwise
we may meet an insane deadlock. [Bug#4121][ruby-dev:42686]
Wed Sep 8 22:46:31 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org> Wed Sep 8 22:46:31 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was * ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was

2
ext/pty/pty.c
View file

@ -166,6 +166,8 @@ chfunc(void *data)
struct exec_info arg; struct exec_info arg;
int status; int status;
rb_thread_atfork_before_exec();
/* /*
* Set free from process group and controlling terminal * Set free from process group and controlling terminal
*/ */

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 135 #define RUBY_PATCHLEVEL 136
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1