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

* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): TimeoutError is

Browse source 
obsolete, use Timeout::Error instead.  [ruby-core:23821]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-06-12 21:50:35 +00:00
parent 6d781384c5
commit 63118829d9
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Jun 13 06:50:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): TimeoutError is
obsolete, use Timeout::Error instead. [ruby-core:23821]
Sat Jun 13 06:45:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 13 06:45:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (rb_f_throw): fixed rdoc about execption. * vm_eval.c (rb_f_throw): fixed rdoc about execption.

4
lib/net/protocol.rb
View file

@ -137,7 +137,7 @@ module Net # :nodoc:
if IO.select([@io], nil, nil, @read_timeout) if IO.select([@io], nil, nil, @read_timeout)
retry retry
else else
raise Timeout::TimeoutError raise Timeout::Error
end end
rescue IO::WaitWritable rescue IO::WaitWritable
# OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable. # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
@ -145,7 +145,7 @@ module Net # :nodoc:
if IO.select(nil, [@io], nil, @read_timeout) if IO.select(nil, [@io], nil, @read_timeout)
retry retry
else else
raise Timeout::TimeoutError raise Timeout::Error
end end
end end
end end