diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-07-25 12:08:07 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-07-25 12:08:07 +0100 |
commit | c93e0181f117120b39ad70820c7607f08646e25d (patch) | |
tree | b19fa60934360ab841326494a7ffe453fecd60e3 | |
parent | 9398ba77f3a9abf825b3e7b4e57c4a0d1252a106 (diff) | |
download | prosody-c93e0181f117120b39ad70820c7607f08646e25d.tar.gz prosody-c93e0181f117120b39ad70820c7607f08646e25d.zip |
net.dns: Ensure all pending requests get notified of a timeout when looking up a record (fix for d122420542fb)
-rw-r--r-- | net/dns.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/dns.lua b/net/dns.lua index 492bd1c5..906365ce 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -770,7 +770,7 @@ function resolver:query(qname, qtype, qclass) -- - - - - - - - - - -- query end end -- Tried everything, failed - self:cancel(qclass, qtype, qname, co, true); + self:cancel(qclass, qtype, qname); end end) end @@ -910,13 +910,13 @@ function resolver:feed(sock, packet, force) return response; end -function resolver:cancel(qclass, qtype, qname, co, call_handler) +function resolver:cancel(qclass, qtype, qname) local cos = get(self.wanted, qclass, qtype, qname); if cos then - if call_handler then - coroutine.resume(co); + for co in pairs(cos) do + if coroutine.status(co) == "suspended" then coroutine.resume(co); end end - cos[co] = nil; + set(self.wanted, qclass, qtype, qname, nil); end end |