ruby-changes:22521
From: nagachika <ko1@a...>
Date: Mon, 13 Feb 2012 09:20:46 +0900 (JST)
Subject: [ruby-changes:22521] nagachika:r34558 (ruby_1_9_3): merge revision(s) 32550:
nagachika 2012-02-11 15:55:45 +0900 (Sat, 11 Feb 2012) New Revision: 34558 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34558 Log: 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. Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 34557) +++ ruby_1_9_3/ChangeLog (revision 34558) @@ -1,3 +1,14 @@ +Sat Feb 11 15:54:37 2012 NAKAMURA Usaku <usa@r...> + + * 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@f...> * test/openssl/test_ssl.rb (test_multibyte_read_write): start server Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 34557) +++ ruby_1_9_3/version.h (revision 34558) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 95 +#define RUBY_PATCHLEVEL 96 #define RUBY_RELEASE_DATE "2012-02-11" #define RUBY_RELEASE_YEAR 2012 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/