archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert r66968

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@66975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2019-02-01 02:17:14 +00:00
parent 05b05a8f56
commit 1cc19523c2
4 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cont.c
View file

@ -1660,20 +1660,6 @@ rb_fiber_s_current(VALUE klass)
#ifdef HAVE_WORKING_FORK
void
rb_fiber_atfork(rb_thread_t *th)
{
if (th->root_fiber) {
if (&th->root_fiber->cont.saved_ec != th->ec) {
th->root_fiber = th->ec->fiber_ptr;
th->root_fiber->cont.type = ROOT_FIBER_CONTEXT;
}
th->root_fiber->prev = 0;
}
}
#endif
/*
* Document-class: FiberError
*

6
test/ruby/test_fiber.rb
View file

@ -256,11 +256,7 @@ class TestFiber < Test::Unit::TestCase
end
bug5700 = '[ruby-core:41456]'
assert_nothing_raised(bug5700) do
Fiber.new do
pid = fork do
Fiber.new {}.transfer
end
end.resume
Fiber.new{ pid = fork {} }.resume
end
pid, status = Process.waitpid2(pid)
assert_equal(0, status.exitstatus, bug5700)

2
thread.c
View file

@ -4172,14 +4172,12 @@ terminate_atfork_i(rb_thread_t *th, const rb_thread_t *current_th)
}
}
void rb_fiber_atfork(rb_thread_t *);
void
rb_thread_atfork(void)
{
rb_thread_t *th = GET_THREAD();
rb_thread_atfork_internal(th, terminate_atfork_i);
th->join_list = NULL;
rb_fiber_atfork(th);
/* We don't want reproduce CVE-2003-0900. */
rb_reset_random_seed();

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.6"
#define RUBY_RELEASE_DATE "2019-01-31"
#define RUBY_PATCHLEVEL 346
#define RUBY_RELEASE_DATE "2019-02-01"
#define RUBY_PATCHLEVEL 347
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 31
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 1
#include "ruby/version.h"