Diff

plugins/mod_component.lua @ 5321:33813f000015

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 03 Feb 2013 15:52:27 +0100
parent 5316:310c7e5bb906
child 5370:7838acadb0fa
line wrap: on
line diff
--- a/plugins/mod_component.lua	Tue Jan 22 08:30:38 2013 +0500
+++ b/plugins/mod_component.lua	Sun Feb 03 15:52:27 2013 +0100
@@ -260,7 +260,7 @@
 	local session = { type = "component_unauthed", conn = conn, send = function (data) return _send(conn, tostring(data)); end };
 
 	-- Logging functions --
-	local conn_name = "jcp"..tostring(conn):match("[a-f0-9]+$");
+	local conn_name = "jcp"..tostring(session):match("[a-f0-9]+$");
 	session.log = logger.init(conn_name);
 	session.close = session_close;
 	
@@ -313,6 +313,6 @@
 	listener = listener;
 	default_port = 5347;
 	multiplex = {
-		pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:component%1.*>";
+		pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:component:accept%1.*>";
 	};
 });