Merge with 0.7

Tue, 16 Feb 2010 15:06:06 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Tue, 16 Feb 2010 15:06:06 +0000
changeset 2653
7491cef7b5c5
parent 2650
23995c80286c (current diff)
parent 2652
cbc58fc170ad (diff)
child 2655
42a6e4d09b09

Merge with 0.7

--- a/net/adns.lua	Mon Feb 15 23:06:57 2010 +0000
+++ b/net/adns.lua	Tue Feb 16 15:06:06 2010 +0000
@@ -49,7 +49,9 @@
 	local listener = {};
 	local handler = {};
 	function listener.onincoming(conn, data)
-		dns.feed(handler, data);
+		if data then
+			dns.feed(handler, data);
+		end
 	end
 	function listener.ondisconnect(conn, err)
 		log("warn", "DNS socket for %s disconnected: %s", peername, err);

mercurial