prosody
55faa2fd5549
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 @ 5491:55faa2fd5549

Merge backout
author Matthew Wild <mwild1@gmail.com>
date Thu, 18 Apr 2013 00:40:09 +0100
parent 5486:bcf27dbef6c6
parent 5490:ab821566ede8
child 5492:5d0cc5de5c51
comparison
equal deleted inserted replaced
5488:0880a079d830 5491:55faa2fd5549
549 if not err then 549 if not err then
550 out_put( "server.lua: ssl handshake done" ) 550 out_put( "server.lua: ssl handshake done" )
551 handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions 551 handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions
552 handler.sendbuffer = _sendbuffer 552 handler.sendbuffer = _sendbuffer
553 _ = status and status( handler, "ssl-handshake-complete" ) 553 _ = status and status( handler, "ssl-handshake-complete" )
554 if self.autostart_ssl and listeners.onconnect then
555 listeners.onconnect(self);
556 end
554 _readlistlen = addsocket(_readlist, client, _readlistlen) 557 _readlistlen = addsocket(_readlist, client, _readlistlen)
555 return true 558 return true
556 else 559 else
557 if err == "wantwrite" then 560 if err == "wantwrite" then
558 _sendlistlen = addsocket(_sendlist, client, _sendlistlen) 561 _sendlistlen = addsocket(_sendlist, client, _sendlistlen)