diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-21 04:46:26 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-21 04:46:26 +0000 |
| commit | 21e1939d45d98421def8d64fafe14fd02b58a015 (patch) | |
| tree | e5883fbebc112fa053000f0827fb6051e1ea2134 /ChangeLog | |
| parent | a8ae1416fc1dd576a2e4f42fc2ab69a0141776b9 (diff) | |
merge revision(s) 35625: [Backport #6618]
* thread.c (rb_threadptr_execute_interrupts_common):
test_signal_requiring of test/ruby/test_signal.rb fail if the sub
process is killed on waiting IO in lex_io_gets in rb_load_file in
rb_load_internal in require.
This is because
(1) the process receive the killing signal in
rb_thread_io_blocking_region in rb_read_internal in lex_io_gets.
(2) set th->errinfo as INT2FIX(TAG_FATAL) at
rb_threadptr_execute_interrupts_common.
(3) escape rb_load_file in rb_load_internal and jump to EXEC_TAG()
without set loaded as TRUE.
(4) call first rb_exc_raise(GET_THREAD()->errinfo); because loaded
is FALSE as above. this errinfo should be an exception object
but this is INT2FIX(TAG_FATAL).
Don't call first rb_exc_raise if GET_THREAD()->errinfo is Fixnum.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 18 |
1 files changed, 18 insertions, 0 deletions
@@ -1,3 +1,21 @@ +Thu Jun 21 13:42:57 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * thread.c (rb_threadptr_execute_interrupts_common): + test_signal_requiring of test/ruby/test_signal.rb fail if the sub + process is killed on waiting IO in lex_io_gets in rb_load_file in + rb_load_internal in require. + This is because + (1) the process receive the killing signal in + rb_thread_io_blocking_region in rb_read_internal in lex_io_gets. + (2) set th->errinfo as INT2FIX(TAG_FATAL) at + rb_threadptr_execute_interrupts_common. + (3) escape rb_load_file in rb_load_internal and jump to EXEC_TAG() + without set loaded as TRUE. + (4) call first rb_exc_raise(GET_THREAD()->errinfo); because loaded + is FALSE as above. this errinfo should be an exception object + but this is INT2FIX(TAG_FATAL). + Don't call first rb_exc_raise if GET_THREAD()->errinfo is Fixnum. + Mon Jun 11 19:56:22 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * test/webrick/test_cgi.rb (class TestWEBrickCGI): respect |