aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-05 19:50:34 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-05 19:50:34 +0000
commitfe6e46a55f68f566290250655247cd1393ae6d2c (patch)
tree1cf6e6e0fad1a9efd467895c02e748522dc2ca06 /net/server.lua
parentb2afc52730ae023a4fa3c4da525b3d1f92e5f1b9 (diff)
parentc016526d9d5b57c8b6157cba7eee4bb268e1e9b4 (diff)
downloadprosody-fe6e46a55f68f566290250655247cd1393ae6d2c.tar.gz
prosody-fe6e46a55f68f566290250655247cd1393ae6d2c.zip
Merge
Diffstat (limited to 'net/server.lua')
-rw-r--r--net/server.lua15
1 files changed, 2 insertions, 13 deletions
diff --git a/net/server.lua b/net/server.lua
index 7fdb3275..e01ddfb7 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -501,24 +501,13 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss
handler.starttls = function (now)
if not now then out_put("server.lua: we need to do tls, but delaying until later"); handler.need_tls = true; return; end
out_put( "server.lua: attempting to start tls on "..tostring(socket) )
- local oldsocket = socket;
socket, err = ssl_wrap( socket, sslctx ) -- wrap socket
out_put("sslwrapped socket is "..tostring(socket));
if err then
out_put( "server.lua: ssl error: ", err )
return nil, nil, err -- fatal error
end
- socket:settimeout(0);
-
- -- Add the new socket to our system
- socketlist[ socket ] = handler
- readlen = readlen + 1
- readlist[ readlen ] = socket
-
- -- Remove traces of the old socket
- readlen = removesocket( readlist, oldsocket, readlen )
- socketlist [ oldsocket ] = nil;
-
+ socket:settimeout( 1 )
send = socket.send
receive = socket.receive
close = socket.close
@@ -543,7 +532,7 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss
out_put( "server.lua: ssl handshake done" )
writelen = ( wrote and removesocket( writelist, socket, writelen ) ) or writelen
handler.receivedata = handler._receivedata -- when handshake is done, replace the handshake function with regular functions
- handler.dispatchdata = handler._dispatchdata
+ handler.dispatchdata = handler._dispatchdata;
return true;
else
out_put( "server.lua: error during ssl handshake: ", err )