diff options
| -rw-r--r-- | net/server.lua | 2 | ||||
| -rw-r--r-- | net/xmppclient_listener.lua | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua index 40cc6dc8..3bbe80b4 100644 --- a/net/server.lua +++ b/net/server.lua @@ -523,6 +523,8 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss return receive( socket, pattern, prefix )
end
+ handler.starttls = nil;
+
handler.handshake = coroutine_wrap( function( client )
local err
for i = 1, 10 do -- 10 handshake attemps
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua index b475237f..b5028db0 100644 --- a/net/xmppclient_listener.lua +++ b/net/xmppclient_listener.lua @@ -82,7 +82,7 @@ function xmppclient.disconnect(conn, err) pres:tag("status"):text("Disconnected: "..err); session.stanza_dispatch(pres); end - session.log("info", "Client disconnected: %s", err); + (session.log or log)("info", "Client disconnected: %s", err); sm_destroy_session(session); sessions[conn] = nil; session = nil; |