diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/ftp.rb | 2 | ||||
| -rw-r--r-- | lib/resolv.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/httprequest.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 6b452b8a75..c64bb5c682 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -103,7 +103,7 @@ module Net # Number of seconds to wait for one block to be read (via one read(2) # call). Any number may be used, including Floats for fractional # seconds. If the FTP object cannot read data in this many seconds, - # it raises a TimeoutError exception. The default value is 60 seconds. + # it raises a Timeout::Error exception. The default value is 60 seconds. attr_reader :read_timeout # Setter for the read_timeout attribute. diff --git a/lib/resolv.rb b/lib/resolv.rb index 9c7dd1b9b3..293e559acf 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -158,7 +158,7 @@ class Resolv ## # Indicates a timeout resolving a name or address. - class ResolvTimeout < TimeoutError; end + class ResolvTimeout < Timeout::Error; end ## # Resolv::Hosts is a hostname resolver that uses the system hosts file. diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb index 4dfaee99af..6aa2d1c1f2 100644 --- a/lib/webrick/httprequest.rb +++ b/lib/webrick/httprequest.rb @@ -521,7 +521,7 @@ module WEBrick } rescue Errno::ECONNRESET return nil - rescue TimeoutError + rescue Timeout::Error raise HTTPStatus::RequestTimeout end end |