2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b35d25e2f..444251661b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 14 23:01:19 2011  CHIKANAGA Tomoyuki  <[email protected]>
+
+	* thread.c (rb_thread_io_blocking_region): reset th->waiting_fd
+	  after blocking region, because remaining waiting_fd might
+	  cause unnecessary IOError.
+
 Mon Feb 14 21:06:50 2011  URABE Shyouhei  <[email protected]>
 
 	* configure.in: revert r30621.  That revision introduced mkmf test
diff --git a/thread.c b/thread.c
index 7108f586af..927dbc4131 100644
--- a/thread.c
+++ b/thread.c
@@ -1151,6 +1151,7 @@ rb_thread_io_blocking_region(rb_blocking_function_t *func, void *data1, int fd)
 	val = func(data1);
 	saved_errno = errno;
     }, ubf_select, th);
+    th->waiting_fd = -1;
     errno = saved_errno;
 
     return val;