diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | thread.c | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Thu Oct 9 08:47:38 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * thread.c (rb_thread_wait_fd_rw): should not block by select if + there's only one thread living. fixed [ruby-dev:36646]. + Wed Oct 8 20:59:52 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> * ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage @@ -2235,6 +2235,7 @@ rb_thread_wait_fd_rw(int fd, int read) if (fd < 0) { rb_raise(rb_eIOError, "closed stream"); } + if (rb_thread_alone()) return; while (result <= 0) { rb_fdset_t set; rb_fd_init(&set); |