prosody
36c169ed1576
net/server_select.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

net/server_select.lua @ 2998:36c169ed1576

Merge Tobias's fancy SASL branch->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 05 May 2010 11:29:10 +0100
parent 2970:9b8e139eff5f
parent 2997:6ccaefea80ec
child 3007:9d122a6ae674
comparison
equal deleted inserted replaced
2989:87c378c77be3 2998:36c169ed1576
506 _, err = client:dohandshake( ) 506 _, err = client:dohandshake( )
507 if not err then 507 if not err then
508 out_put( "server.lua: ssl handshake done" ) 508 out_put( "server.lua: ssl handshake done" )
509 handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions 509 handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions
510 handler.sendbuffer = _sendbuffer 510 handler.sendbuffer = _sendbuffer
511 out_put ("server.lua: compression used: "..tostring(client:compression()))
512 out_put ("server.lua: finished: "..tostring(client:getfinished()):sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"))
513 out_put ("server.lua: peer finished: "..tostring(client:getpeerfinished()):sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"))
511 _ = status and status( handler, "ssl-handshake-complete" ) 514 _ = status and status( handler, "ssl-handshake-complete" )
512 _readlistlen = addsocket(_readlist, client, _readlistlen) 515 _readlistlen = addsocket(_readlist, client, _readlistlen)
513 return true 516 return true
514 else 517 else
515 out_put( "server.lua: error during ssl handshake: ", tostring(err) ) 518 out_put( "server.lua: error during ssl handshake: ", tostring(err) )