1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): avoid calling

read_nonblock in rescue.  use retry instead.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-12-23 15:24:54 +00:00
parent 19fee2e2e0
commit d5bc38fdbf
2 changed files with 6 additions and 1 deletions

View file

@ -171,6 +171,11 @@ Mon Dec 22 18:00:36 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c: fix wrong flag value.
Mon Dec 22 15:15:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): avoid calling
read_nonblock in rescue. use retry instead.
Mon Dec 22 14:35:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_external_str_new_with_enc): set ASCII-8BIT if

View file

@ -135,7 +135,7 @@ module Net # :nodoc:
@rbuf << @io.read_nonblock(BUFSIZE)
rescue Errno::EWOULDBLOCK
if IO.select([@io], nil, nil, @read_timeout)
@rbuf << @io.read_nonblock(BUFSIZE)
retry
else
raise Timeout::TimeoutError
end