# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266332766 0
# Node ID 7491cef7b5c566efe45f92d723f2fc02950f6915
# Parent  23995c80286cb829748b1002d4f843e696d87b34# Parent  cbc58fc170adfbc8c398a1f16d8724da4f9e2719
Merge with 0.7

diff -r 23995c80286c -r 7491cef7b5c5 net/adns.lua
--- 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);