aboutsummaryrefslogtreecommitdiffstats
path: root/main.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-10-05 19:16:32 +0100
committerMatthew Wild <mwild1@gmail.com>2008-10-05 19:16:32 +0100
commit3b33f156543f9d521885afd84d479052b4debcc0 (patch)
tree61b7ce7a6bfc0919de331db7855cf2e04e349eaf /main.lua
parent11883a5b0bd98527f9cf6ad644a285551dce02c4 (diff)
parent0c9336110d8dceb2c9801ee68b9817801014fefe (diff)
downloadprosody-3b33f156543f9d521885afd84d479052b4debcc0.tar.gz
prosody-3b33f156543f9d521885afd84d479052b4debcc0.zip
Merged local TLS branch
Diffstat (limited to 'main.lua')
-rw-r--r--main.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.lua b/main.lua
index 821b3273..633c3df8 100644
--- a/main.lua
+++ b/main.lua
@@ -101,7 +101,7 @@ setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A N
local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end;
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;
-server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5222, "*", 1, nil ) -- server.add will send a status message
-server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5223, "*", 1, ssl_ctx ) -- server.add will send a status message
+server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5222, "*", 1, ssl_ctx ) -- server.add will send a status message
+--server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5223, "*", 1, ssl_ctx ) -- server.add will send a status message
server.loop();