# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1248730956 -3600
# Node ID 07be0ac220d88e605045188f030c12269ede66e6
# Parent  d81f5bb1f6b8d4b53ad1bee7fb8600718b4285d7# Parent  95d3bcd82334fc5ecc9f3140d854baa457508e50
Merge with 0.5

diff -r d81f5bb1f6b8 -r 07be0ac220d8 core/stanza_router.lua
--- a/core/stanza_router.lua	Mon Jul 27 01:28:22 2009 +0100
+++ b/core/stanza_router.lua	Mon Jul 27 22:42:36 2009 +0100
@@ -150,11 +150,7 @@
 			component_handle_stanza(origin, stanza);
 			return;
 		end
-		if not modules_handle_stanza(h.host, origin, stanza) then
-			if stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
-				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
-			end
-		end
+		modules_handle_stanza(h.host, origin, stanza);
 	else
 		core_route_stanza(origin, stanza);
 	end
diff -r d81f5bb1f6b8 -r 07be0ac220d8 net/httpserver.lua
--- a/net/httpserver.lua	Mon Jul 27 01:28:22 2009 +0100
+++ b/net/httpserver.lua	Mon Jul 27 22:42:36 2009 +0100
@@ -105,7 +105,7 @@
 		if response then
 			if response == true and not request.destroyed then
 				-- Keep connection open, we will reply later
-				log("warn", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
+				log("debug", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
 			elseif response ~= true then
 				-- Assume response
 				send_response(request, response);