diff options
| author | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
| commit | 1929113b7830954ae60ad49934b3c16bf746a9ba (patch) | |
| tree | a1d3fc24abd3048cb23d45b860640a83baa8c261 /plugins/mod_component.lua | |
| parent | 0f2d3d7139c741b6bd8714048694ee16a9b11c91 (diff) | |
| parent | 5cfdac70c61ae6562f72868ef7b55129b166aa80 (diff) | |
| download | prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.tar.gz prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_component.lua')
| -rw-r--r-- | plugins/mod_component.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua index 16084a78..68d8a5de 100644 --- a/plugins/mod_component.lua +++ b/plugins/mod_component.lua @@ -260,7 +260,7 @@ function listener.onconnect(conn) 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 @@ module:provides("net", { listener = listener; default_port = 5347; multiplex = { - pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:component%1.*>"; + pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:component:accept%1.*>"; }; }); |