From 9d3c6849c0a9e8c37374157d7feba95201c542e5 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 15 Feb 2010 23:06:57 +0000 Subject: Makefile: Remove fallbacks/ --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 46dddfdb..4090d554 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin install -m750 -d $(DATA) install -d $(MAN)/man1 install -d $(CONFIG)/certs - install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util $(SOURCE)/fallbacks + install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util install -m755 ./prosody.install $(BIN)/prosody install -m755 ./prosodyctl.install $(BIN)/prosodyctl install -m644 core/* $(SOURCE)/core @@ -30,7 +30,6 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin install -m644 util/*.so $(SOURCE)/util install -d $(SOURCE)/util/sasl install -m644 util/sasl/* $(SOURCE)/util/sasl - install -m644 fallbacks/* $(SOURCE)/fallbacks install -m644 plugins/*.lua $(MODULES) install -d $(MODULES)/muc install -m644 plugins/muc/* $(MODULES)/muc -- cgit v1.2.3 From 597eb290d4d114bfd8bf24b0947de1fba66b17e8 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 16 Feb 2010 15:05:18 +0000 Subject: net.adns: Fix potential traceback on DNS responses with libevent enabled (thanks Flo) --- net/adns.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3