aboutsummaryrefslogtreecommitdiffstats
path: root/main.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-10-24 07:36:48 +0100
committerMatthew Wild <mwild1@gmail.com>2008-10-24 07:36:48 +0100
commit2d7656d5db5476fd31a41e71e46205cab1bce74f (patch)
treef2cb19832a1a1c35d4a42286138b9f80968bc3da /main.lua
parentd49ea8a12e4440a0df267b575e4925231bda4803 (diff)
parent5c90ffdf7e7c7d784ed5f60eed3f8a2666c117f8 (diff)
downloadprosody-2d7656d5db5476fd31a41e71e46205cab1bce74f.tar.gz
prosody-2d7656d5db5476fd31a41e71e46205cab1bce74f.zip
Merging more s2s
Diffstat (limited to 'main.lua')
-rw-r--r--main.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/main.lua b/main.lua
index e9e8fca2..a379c826 100644
--- a/main.lua
+++ b/main.lua
@@ -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();