mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
merge revision(s) 63741: [Backport #14868]
process.c (ruby_fork_ruby): fix race in signal handling We must block signals before stopping timer-thread, otherwise signal handing may be delayed until (and if) another signal is received after timer-thread is restarted. [ruby-core:87622] [Bug #14868] [Bug #13916] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
cc371cc094
commit
c66c5f3c6c
2 changed files with 2 additions and 2 deletions
|
@ -3651,8 +3651,8 @@ rb_fork_ruby(int *status)
|
|||
|
||||
while (1) {
|
||||
prefork();
|
||||
before_fork_ruby();
|
||||
disable_child_handler_before_fork(&old);
|
||||
before_fork_ruby();
|
||||
pid = fork();
|
||||
err = errno;
|
||||
after_fork_ruby();
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#define RUBY_VERSION "2.5.2"
|
||||
#define RUBY_RELEASE_DATE "2018-08-18"
|
||||
#define RUBY_PATCHLEVEL 80
|
||||
#define RUBY_PATCHLEVEL 81
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2018
|
||||
#define RUBY_RELEASE_MONTH 8
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue