diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-11 06:55:45 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-11 06:55:45 +0000 |
| commit | 31dd3b32817cc7ecb0e69bcb19f82e019e528768 (patch) | |
| tree | 9ba36608f90c38fb505d6b61518fcae816ccd082 /ChangeLog | |
| parent | 6396bcb8e3afa3536c064c5ea291b04edde1e03f (diff) | |
merge revision(s) 32550:
* win32/win32.c, include/ruby/win32.h (rb_w32_io_cancelable_p): renamed
from rb_w32_has_cancel_io(). now it takes a parameter as fd to check
the fd is console or not, because we cannot cancel console input even
if we have cancel_io function.
* io.c (WAIT_FD_IN_WIN32): call above function instead of the old one,
so now we can kill the thread which calls STDIN.gets.
the problem was reported by ko1 via IRC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,14 @@ +Sat Feb 11 15:54:37 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c, include/ruby/win32.h (rb_w32_io_cancelable_p): renamed + from rb_w32_has_cancel_io(). now it takes a parameter as fd to check + the fd is console or not, because we cannot cancel console input even + if we have cancel_io function. + + * io.c (WAIT_FD_IN_WIN32): call above function instead of the old one, + so now we can kill the thread which calls STDIN.gets. + the problem was reported by ko1 via IRC. + Sat Feb 11 08:06:12 2012 Tanaka Akira <akr@fsij.org> * test/openssl/test_ssl.rb (test_multibyte_read_write): start server |