aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-16 15:06:06 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-16 15:06:06 +0000
commit13528357136999aa24c652df2aae865f9fbf7f35 (patch)
treef21dbfa5bce6c7ca3316c4a9a8bda93e9d4013a3
parentcb24bc1a122551895e382706d50029b3e8de4e72 (diff)
parent597eb290d4d114bfd8bf24b0947de1fba66b17e8 (diff)
downloadprosody-13528357136999aa24c652df2aae865f9fbf7f35.tar.gz
prosody-13528357136999aa24c652df2aae865f9fbf7f35.zip
Merge with 0.7
-rw-r--r--net/adns.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/adns.lua b/net/adns.lua
index 4341ffb5..d1876b0f 100644
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -49,7 +49,9 @@ function new_async_socket(sock, resolver)
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);