aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-03-15 03:05:24 +0000
committerMatthew Wild <mwild1@gmail.com>2012-03-15 03:05:24 +0000
commit8496bd382a0b357eeefbb03e593104b0f11420f2 (patch)
tree9f2d8793a23f9b0bad826cb92f8e7954a0eadbc3
parente776782e7fd00b7d8d99b5ef831b420b8e6480f0 (diff)
downloadprosody-8496bd382a0b357eeefbb03e593104b0f11420f2.tar.gz
prosody-8496bd382a0b357eeefbb03e593104b0f11420f2.zip
mod_c2s, mod_s2s: Add multiplex support
-rw-r--r--plugins/mod_c2s.lua3
-rw-r--r--plugins/s2s/mod_s2s.lua3
2 files changed, 6 insertions, 0 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index e3557492..67156f55 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -231,6 +231,9 @@ module:add_item("net-provider", {
name = "legacy_ssl";
listener = listener;
encryption = "ssl";
+ multiplex = {
+ pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:client%1.*>";
+ };
});
diff --git a/plugins/s2s/mod_s2s.lua b/plugins/s2s/mod_s2s.lua
index 194364cd..04b8ae04 100644
--- a/plugins/s2s/mod_s2s.lua
+++ b/plugins/s2s/mod_s2s.lua
@@ -472,5 +472,8 @@ module:add_item("net-provider", {
listener = listener;
default_port = 5269;
encryption = "starttls";
+ multiplex = {
+ pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:server%1.*>";
+ };
});