matz	2008-10-09 08:49:22 +0900 (Thu, 09 Oct 2008)

  New Revision: 19719

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19719

  Log:
    * thread.c (rb_thread_wait_fd_rw): should not block by select if
      there's only one thread living.  fixed [ruby-dev:36646].

  Modified files:
    trunk/ChangeLog
    trunk/thread.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19718)
+++ ChangeLog	(revision 19719)
@@ -1,3 +1,8 @@
+Thu Oct  9 08:47:38 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@n...>
 
 	* ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage
Index: thread.c
===================================================================
--- thread.c	(revision 19718)
+++ thread.c	(revision 19719)
@@ -2235,6 +2235,7 @@
     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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/