nobu	2008-02-18 10:17:44 +0900 (Mon, 18 Feb 2008)

  New Revision: 15531

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/pty/lib/expect.rb
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/ext/pty/lib/expect.rb

  Log:
    * ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
      [ruby-Bugs-17940]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/pty/lib/expect.rb?r1=15531&r2=15530&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15531&r2=15530&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15531&r2=15530&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/pty/lib/expect.rb?r1=15531&r2=15530&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15531&r2=15530&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15530)
+++ ChangeLog	(revision 15531)
@@ -1,3 +1,8 @@
+Mon Feb 18 10:17:42 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
+	  [ruby-Bugs-17940]
+
 Mon Feb 18 00:33:03 2008  Tanaka Akira  <akr@f...>
 
 	* re.c (rb_reg_regsub): don't repeat repl twice with
Index: ext/pty/lib/expect.rb
===================================================================
--- ext/pty/lib/expect.rb	(revision 15530)
+++ ext/pty/lib/expect.rb	(revision 15531)
@@ -10,7 +10,7 @@
       e_pat = pat
     end
     while true
-      if IO.select([self],nil,nil,timeout).nil? then
+      if !IO.select([self],nil,nil,timeout) or eof? then
         result = nil
         break
       end
Index: ruby_1_8/ext/pty/lib/expect.rb
===================================================================
--- ruby_1_8/ext/pty/lib/expect.rb	(revision 15530)
+++ ruby_1_8/ext/pty/lib/expect.rb	(revision 15531)
@@ -10,7 +10,7 @@
       e_pat = pat
     end
     while true
-      if IO.select([self],nil,nil,timeout).nil? then
+      if !IO.select([self],nil,nil,timeout) or eof? then
         result = nil
         break
       end
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15530)
+++ ruby_1_8/ChangeLog	(revision 15531)
@@ -1,3 +1,8 @@
+Mon Feb 18 10:17:42 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
+	  [ruby-Bugs-17940]
+
 Fri Feb 15 20:37:06 2008  Tadayoshi Funaba  <tadf@d...>
 
 	* lib/rational.rb (floor, ceil, truncate, round): do not use
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 15530)
+++ ruby_1_8/version.h	(revision 15531)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-02-15"
+#define RUBY_RELEASE_DATE "2008-02-18"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080215
+#define RUBY_RELEASE_CODE 20080218
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 18
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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