diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-24 02:00:15 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-24 02:00:15 +0000 |
commit | 9694e07f555d3bd3c7d2a41777290fa9fc181d52 (patch) | |
tree | 48fb66f0b6f6a8ec1f5213c0ea1bf45a52b51dc9 /ChangeLog | |
parent | 55f1a19451e5fab7e1085a7ae29dfdb96ef3f775 (diff) |
merges r28330 from trunk into ruby_1_9_2.
--
* test/ruby/test_io.rb (safe_4): does not use Timeout because
Timeout.timeout uses Thread#kill which raises SecurityError when
$SAFE == 4. based on a patch from Tomoyuki Chikanaga.
[ruby-dev:41484]
* test/ruby/test_io.rb (test_print_separators): use pipe (test helper
method) instead of IO.pipe. [ruby-dev:41484]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,13 @@ +Wed Jun 16 00:04:38 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * test/ruby/test_io.rb (safe_4): does not use Timeout because + Timeout.timeout uses Thread#kill which raises SecurityError when + $SAFE == 4. based on a patch from Tomoyuki Chikanaga. + [ruby-dev:41484] + + * test/ruby/test_io.rb (test_print_separators): use pipe (test helper + method) instead of IO.pipe. [ruby-dev:41484] + Mon Jun 14 04:03:55 2010 NARUSE, Yui <naruse@ruby-lang.org> * ext/fiddle/closure.c (dealloc): refix workaround r28300. |