diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:22:41 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:22:41 +0000 |
commit | 823be2d795e2435cc5aa9b35c787fb5ac87d02ac (patch) | |
tree | bfdb8a1c6bea93bd2213639be9a63a8d0b795115 | |
parent | 4cff5e63b9556d60cdf62f78b92bcb51024bb7a4 (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/pty/lib/expect.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Jun 15 19:22:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/pty/lib/expect.rb (IO#expect): check if peer is closed. + [ruby-Bugs-17940] + Sun Jun 15 19:20:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * 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 @@ -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 |