* lib/timeout.rb (timeout): new optional argument to specify an

exception class.

* lib/resolv.rb: use Resolv::ResolvTimeout for internal timeout to
avoid problem with timeout of application.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/resolv.rb b/lib/resolv.rb
index 4c95826653..bfe8dd8b61 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -258,6 +258,9 @@ class Resolv
   class ResolvError < StandardError
   end
 
+  class ResolvTimeout < TimeoutError
+  end
+
   class Hosts
     DefaultFileName = '/etc/hosts'
 
@@ -426,7 +429,7 @@ class Resolv
           end
           sender.send
           reply = reply_name = nil
-          timeout(tout) { reply, reply_name = q.pop }
+          timeout(tout, ResolvTimeout) { reply, reply_name = q.pop }
           case reply.rcode
           when RCode::NoError
             extract_resources(reply, reply_name, typeclass, &proc)
@@ -753,7 +756,7 @@ class Resolv
                 @nameserver.each {|nameserver|
                   begin
                     yield candidate, tout, nameserver
-                  rescue TimeoutError
+                  rescue ResolvTimeout
                   end
                 }
               }