Mercurial > prosody-hg
comparison net/dns.lua @ 6866:abff7543b79c
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Sep 2015 16:51:42 +0100 |
| parents | 86fcc3fa1a97 88d54bec26b7 |
| children | eda0feeaf759 |
comparison
equal
deleted
inserted
replaced
| 6858:d8f8c0b2fda8 | 6866:abff7543b79c |
|---|---|
| 851 and self.active[response.header.id][response.question.raw] then | 851 and self.active[response.header.id][response.question.raw] then |
| 852 --print('received response'); | 852 --print('received response'); |
| 853 --self.print(response); | 853 --self.print(response); |
| 854 | 854 |
| 855 for j,rr in pairs(response.answer) do | 855 for j,rr in pairs(response.answer) do |
| 856 if rr.name:sub(-#response.question[1].name, -1) == response.question[1].name then | 856 self:remember(rr, response.question[1].type) |
| 857 self:remember(rr, response.question[1].type) | |
| 858 end | |
| 859 end | 857 end |
| 860 | 858 |
| 861 -- retire the query | 859 -- retire the query |
| 862 local queries = self.active[response.header.id]; | 860 local queries = self.active[response.header.id]; |
| 863 queries[response.question.raw] = nil; | 861 queries[response.question.raw] = nil; |
