summaryrefslogtreecommitdiffstats
path: root/lib/net/protocol.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-12 21:50:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-12 21:50:35 +0000
commit2c6a6255527c511a4cee1421c48b037eb3fa12d0 (patch)
tree93bc5beebff141b76a751e7c784f9e414bb07563 /lib/net/protocol.rb
parentde9012a981b4991065faac63228c51bb1a44c3bc (diff)
downloadruby-2c6a6255527c511a4cee1421c48b037eb3fa12d0.tar.gz
ruby-2c6a6255527c511a4cee1421c48b037eb3fa12d0.tar.xz
ruby-2c6a6255527c511a4cee1421c48b037eb3fa12d0.zip
* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): TimeoutError is
obsolete, use Timeout::Error instead. [ruby-core:23821] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23674 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net/protocol.rb')
-rw-r--r--lib/net/protocol.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index d927c52f3..2a6cfb4f6 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -137,7 +137,7 @@ module Net # :nodoc:
if IO.select([@io], nil, nil, @read_timeout)
retry
else
- raise Timeout::TimeoutError
+ raise Timeout::Error
end
rescue 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)
retry
else
- raise Timeout::TimeoutError
+ raise Timeout::Error
end
end
end