# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1246281229 -3600
# Node ID 700ea94e176959f5c93bb095bbde402e9990ec4e
# Parent  cc20d6dfa32d09455b49287699edd02ab5d75c3b# Parent  c727348c7e6376eae92c909f209dd9de967c3b5a
Automated merge with http://waqas.ath.cx:8000/

diff -r c727348c7e63 -r 700ea94e1769 core/modulemanager.lua
--- a/core/modulemanager.lua	Mon Jun 29 14:10:11 2009 +0100
+++ b/core/modulemanager.lua	Mon Jun 29 14:13:49 2009 +0100
@@ -257,7 +257,7 @@
 			if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
 				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 			end
-		elseif not(name == "features" and xmlns == "http://etherx.jabber.org/streams") then -- FIXME remove check once we handle S2S features
+		elseif not((name == "features" or name == "error") and xmlns == "http://etherx.jabber.org/streams") then -- FIXME remove check once we handle S2S features
 			origin:close("unsupported-stanza-type");
 		end
 	end
diff -r c727348c7e63 -r 700ea94e1769 core/stanza_router.lua
--- a/core/stanza_router.lua	Mon Jun 29 14:10:11 2009 +0100
+++ b/core/stanza_router.lua	Mon Jun 29 14:13:49 2009 +0100
@@ -139,7 +139,7 @@
 	end
 
 	local event_data = {origin=origin, stanza=stanza};
-	if origin.full_jid then -- c2s connection
+	if origin.full_jid == stanza.attr.from then -- c2s connection
 		if hosts[origin.host].events.fire_event('pre-'..stanza.name..to_type, event_data) then return; end -- do preprocessing
 	end
 	local h = hosts[to_bare] or hosts[host or origin.host];
@@ -151,7 +151,7 @@
 			return;
 		end
 		if not modules_handle_stanza(h.host, origin, stanza) then
-			if stanza.attr.xmlns == "jabber:client" and stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
+			if stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
 				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 			end
 		end
diff -r c727348c7e63 -r 700ea94e1769 prosody.cfg.lua.dist
--- a/prosody.cfg.lua.dist	Mon Jun 29 14:10:11 2009 +0100
+++ b/prosody.cfg.lua.dist	Mon Jun 29 14:13:49 2009 +0100
@@ -38,7 +38,6 @@
 	modules_enabled = {
 			-- Generally required
 				"roster"; -- Allow users to have a roster. Recommended ;)
-				"presence"; -- See and broadcast status changes to/from contacts
 				"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
 				"tls"; -- Add support for secure TLS on c2s/s2s connections
 				"dialback"; -- s2s dialback support