From 823be2d795e2435cc5aa9b35c787fb5ac87d02ac Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 10:22:41 +0000 Subject: merge revision(s) 15531: * 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_6@17181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/pty/lib/expect.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3efb16f5b..03d18c5643 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 15 19:22:21 2008 Nobuyoshi Nakada + + * ext/pty/lib/expect.rb (IO#expect): check if peer is closed. + [ruby-Bugs-17940] + Sun Jun 15 19:20:13 2008 Nobuyoshi Nakada * ext/iconv/iconv.c (iconv_convert): check upper bound. a patch from 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 e5d23ee643..853e9b4231 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 179 +#define RUBY_PATCHLEVEL 180 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3