shyouhei	2008-06-15 19:21:59 +0900 (Sun, 15 Jun 2008)

  New Revision: 17179

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

  Log:
    merge revision(s) 15531:
    * 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_5/version.h?r1=17179&r2=17178&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/pty/lib/expect.rb?r1=17179&r2=17178&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17179&r2=17178&diff_format=u

Index: ruby_1_8_5/ext/pty/lib/expect.rb
===================================================================
--- ruby_1_8_5/ext/pty/lib/expect.rb	(revision 17178)
+++ ruby_1_8_5/ext/pty/lib/expect.rb	(revision 17179)
@@ -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_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17178)
+++ ruby_1_8_5/ChangeLog	(revision 17179)
@@ -1,3 +1,8 @@
+Sun Jun 15 19:21:26 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
+	  [ruby-Bugs-17940]
+
 Sun Jun 15 19:19:21 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/iconv/iconv.c (iconv_convert): check upper bound.  a patch from
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17178)
+++ ruby_1_8_5/version.h	(revision 17179)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 178
+#define RUBY_PATCHLEVEL 179
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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