diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/dns.lua | 10 | ||||
| -rw-r--r-- | net/server_event.lua | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/net/dns.lua b/net/dns.lua index 17119152..a9846e86 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -344,7 +344,7 @@ local function encodeHeader(o) -- - - - - - - - - - - - - - - encodeHeader -- 4 not implemented -- 5 refused -- 6-15 reserved - o.z = o.z or 0; -- 3b 0 resvered + o.z = o.z or 0; -- 3b 0 reserved o.ra = o.ra or 0; -- 1b 1 recursion available o.qdcount = o.qdcount or 1; -- 16b number of question RRs @@ -885,7 +885,7 @@ function resolver:query(qname, qtype, qclass) -- - - - - - - - - - -- query if co then set(self.wanted, qclass, qtype, qname, co, true); end - + if have_timer and self.timeout then local num_servers = #self.server; local i = 1; @@ -941,7 +941,7 @@ function resolver:servfail(sock, err) sock:send(o.packet); end end - end + end if not retried then log("debug", 'tried all servers, giving up'); self:cancel(o.qclass, o.qtype, o.qname); @@ -994,7 +994,7 @@ function resolver:receive(rset) -- - - - - - - - - - - - - - - - - receive -- retire the query local queries = self.active[response.header.id]; queries[response.question.raw] = nil; - + if not next(queries) then self.active[response.header.id] = nil; end if not next(self.active) then self:closeall(); end @@ -1008,7 +1008,7 @@ function resolver:receive(rset) -- - - - - - - - - - - - - - - - - receive set(self.wanted, q.class, q.type, q.name, nil); end end - + end end end diff --git a/net/server_event.lua b/net/server_event.lua index 139c7e5f..c30181b8 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -262,7 +262,7 @@ end --TODO: Deprecate function interface_mt:lock_read(switch) - log("warn", ":lock_read is deprecated, use :pasue() and :resume()"); + log("warn", ":lock_read is deprecated, use :pause() and :resume()"); if switch then return self:pause(); else @@ -540,7 +540,7 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx --vdebug( "tried to read in writecallback, result:", ret ) end if interface.eventwritetimeout then -- luasec only - interface.eventwritetimeout:close( ) -- first we have to close timeout event which where regged after a wantread error + interface.eventwritetimeout:close( ) -- first we have to close timeout event which where registered after a wantread error interface.eventwritetimeout = false end end @@ -607,7 +607,7 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx return -1 -- took too long to get some data from client -> disconnect end if interface._usingssl then -- handle luasec - if interface.eventwritetimeout then -- ok, in the past writecallback was regged + if interface.eventwritetimeout then -- ok, in the past writecallback was registered local ret = interface.writecallback( ) -- call it --vdebug( "tried to write in readcallback, result:", tostring(ret) ) end |