* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.

  [ruby-Bugs-17940]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2a7d90f312..c3e851cf5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 18 10:17:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@dotrb.org>
 
 	* lib/rational.rb (floor, ceil, truncate, round): do not use
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index aa9ab895d3..08191b05b9 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -10,7 +10,7 @@ class IO
       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
diff --git a/version.h b/version.h
index 9375f6bd5d..4e062e0ae5 100644
--- a/version.h
+++ b/version.h
@@ -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[];