diff options
author | Matthew Wild <mwild1@gmail.com> | 2008-10-24 07:36:48 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2008-10-24 07:36:48 +0100 |
commit | 2d7656d5db5476fd31a41e71e46205cab1bce74f (patch) | |
tree | f2cb19832a1a1c35d4a42286138b9f80968bc3da /main.lua | |
parent | d49ea8a12e4440a0df267b575e4925231bda4803 (diff) | |
parent | 5c90ffdf7e7c7d784ed5f60eed3f8a2666c117f8 (diff) | |
download | prosody-2d7656d5db5476fd31a41e71e46205cab1bce74f.tar.gz prosody-2d7656d5db5476fd31a41e71e46205cab1bce74f.zip |
Merging more s2s
Diffstat (limited to 'main.lua')
-rw-r--r-- | main.lua | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -54,5 +54,6 @@ local protected_handler = function (conn, data, err) local success, ret = pcall( local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end; start("xmppclient", { ssl = ssl_ctx }) +start("xmppserver", { ssl = ssl_ctx }) server.loop(); |