summaryrefslogtreecommitdiff
path: root/lib/resolv.rb
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-31 12:03:49 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-31 12:03:49 +0000
commit6533f070ba616662b7ab7504f7bc2a0827394a89 (patch)
tree94cbd9a010a761619b4c8401a80a23d4f06d0618 /lib/resolv.rb
parent687c41dc4d03ba77cd5c286ab721ce56100120e7 (diff)
* lib/resolv.rb (Resolv::DNS): retry IO.select for premature wakeup.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/resolv.rb')
-rw-r--r--lib/resolv.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 6b4e06ad9d..b38c42ab3f 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -657,16 +657,19 @@ class Resolv
end
def request(sender, tout)
- timelimit = Time.now + tout
+ start = Time.now
+ timelimit = start + tout
sender.send
while true
- now = Time.now
- timeout = timelimit - now
+ before_select = Time.now
+ timeout = timelimit - before_select
if timeout <= 0
raise ResolvTimeout
end
select_result = IO.select(@socks, nil, nil, timeout)
if !select_result
+ after_select = Time.now
+ next if after_select < timelimit
raise ResolvTimeout
end
begin