# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1299024954 -18000
# Node ID 2805ebd57d7d1d8a1d229719e1b87ad42100f56f
# Parent  bffce780999de86d075a43582a11d6d54cae68e6# Parent  92594f1c73730168f93b3d895fc39a36fe5db3cb
Merge 0.8->trunk.

diff -r bffce780999d -r 2805ebd57d7d net/connlisteners.lua
--- a/net/connlisteners.lua	Tue Mar 01 06:14:03 2011 +0000
+++ b/net/connlisteners.lua	Wed Mar 02 05:15:54 2011 +0500
@@ -13,8 +13,10 @@
 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 @@
 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 -r bffce780999d -r 2805ebd57d7d prosody
--- a/prosody	Tue Mar 01 06:14:03 2011 +0000
+++ b/prosody	Wed Mar 02 05:15:54 2011 +0500
@@ -345,6 +345,7 @@
 	]]
 
 	require "net.connlisteners";
+	require "net.httpserver";
 	
 	require "util.stanza"
 	require "util.jid"