Merge 0.8->trunk.

2 files changed, 6 insertions, 3 deletions

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index e13f85de..7da25c62 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -13,8 +13,10 @@ local server = require "net.server";
 local log = require "util.logger".init("connlisteners");
 local tostring = tostring;
 
-local dofile, pcall, error =
-      dofile, pcall, error
+local dofile, xpcall, error =
+      dofile, xpcall, error
+
+local debug_traceback = debug.traceback;
 
 module "connlisteners"
 
@@ -37,7 +39,7 @@ end
 function get(name)
 	local h = listeners[name];
 	if not h then
-		local ok, ret = pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua");
+		local ok, ret = xpcall(function() dofile(listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua") end, debug_traceback);
 		if not ok then
 			log("error", "Error while loading listener '%s': %s", tostring(name), tostring(ret));
 			return nil, ret;
diff --git a/prosody b/prosody
index 0aba4bb6..86e82490 100755
--- a/prosody
+++ b/prosody
@@ -345,6 +345,7 @@ function load_secondary_libraries()
 	]]
 
 	require "net.connlisteners";
+	require "net.httpserver";
 	
 	require "util.stanza"
 	require "util.jid"