mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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_5@17179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0f2b4fbcd8
commit
e9ebea251d
3 changed files with 7 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
Sun Jun 15 19:21:26 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:19:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* ext/iconv/iconv.c (iconv_convert): check upper bound. a patch from
|
||||
|
|
|
@ -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 185
|
||||
#define RUBY_RELEASE_CODE 20080615
|
||||
#define RUBY_PATCHLEVEL 178
|
||||
#define RUBY_PATCHLEVEL 179
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 8
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue