Mercurial > prosody-hg

comparison prosody @ 1112:e8a00a2ea910

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 0.4
author Matthew Wild <mwild1@gmail.com>
date Mon, 04 May 2009 19:57:05 +0100
parents b51a65066595
children 507702cf44f8
comparison
equal deleted inserted replaced
1103:b78b1524eb79 1112:e8a00a2ea910
154 end 154 end
155 end 155 end
156 156
157 net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp"); 157 net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
158 net_activate_ports("s2s", "xmppserver", {5269}, "tcp"); 158 net_activate_ports("s2s", "xmppserver", {5269}, "tcp");
159 net_activate_ports("component", "xmppcomponent", {}, "tcp");
159 net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl"); 160 net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
160 161
161 if cl.get("console") then 162 if cl.get("console") then
162 cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" }) 163 cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" })
163 end 164 end