summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 10:22:41 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 10:22:41 +0000
commit823be2d795e2435cc5aa9b35c787fb5ac87d02ac (patch)
treebfdb8a1c6bea93bd2213639be9a63a8d0b795115 /ext
parent4cff5e63b9556d60cdf62f78b92bcb51024bb7a4 (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
Diffstat (limited to 'ext')
-rw-r--r--ext/pty/lib/expect.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index aa9ab89..08191b0 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