diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-05-05 11:29:10 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-05-05 11:29:10 +0100 |
| commit | a17cc3b6791eaf110ded69edbc07e41e881e036d (patch) | |
| tree | ae4b02ccb9e9117eafb78c2d8c74951f6e528972 /net | |
| parent | cca05af3d369ba4e53cd76f7e33196c5ee8415b4 (diff) | |
| parent | b05ccd7b3affed026faf4b492d91af972f5ae8ac (diff) | |
| download | prosody-a17cc3b6791eaf110ded69edbc07e41e881e036d.tar.gz prosody-a17cc3b6791eaf110ded69edbc07e41e881e036d.zip | |
Merge Tobias's fancy SASL branch->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_select.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index 48262ccc..94461f45 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -508,6 +508,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport out_put( "server.lua: ssl handshake done" ) handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions handler.sendbuffer = _sendbuffer + out_put ("server.lua: compression used: "..tostring(client:compression())) + out_put ("server.lua: finished: "..tostring(client:getfinished()):sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_")) + out_put ("server.lua: peer finished: "..tostring(client:getpeerfinished()):sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_")) _ = status and status( handler, "ssl-handshake-complete" ) _readlistlen = addsocket(_readlist, client, _readlistlen) return true |