diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/resolv.rb | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Feb 24 22:39:15 2010 Tanaka Akira <akr@fsij.org> + + * lib/resolv.rb: fix [ruby-core:28320] reported by Paul Clegg. + (Resolv::DNS::Requester#request): raise ResolvTimeout + consistently for timeout. + Wed Feb 24 14:38:16 2010 Eric Hodel <drbrain@segment7.net> * lib/rubygems/indexer: Removed obsolete files. diff --git a/lib/resolv.rb b/lib/resolv.rb index ffced98052..5a6032c604 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -628,8 +628,12 @@ class Resolv def request(sender, tout) timelimit = Time.now + tout sender.send - while (now = Time.now) < timelimit + while true + now = Time.now timeout = timelimit - now + if timeout <= 0 + raise ResolvTimeout + end select_result = IO.select(@socks, nil, nil, timeout) if !select_result raise ResolvTimeout |