prosody
0f4025abbe8f
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 @ 6442:0f4025abbe8f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Sep 2014 01:56:22 +0200
parent 6383:ec8878113907
parent 6433:b93402cec1c4
child 6465:ab68bb837fe0
comparison
equal deleted inserted replaced
6432:388786af0dd2 6442:0f4025abbe8f
567 handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions 567 handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions
568 handler.sendbuffer = _sendbuffer 568 handler.sendbuffer = _sendbuffer
569 _ = status and status( handler, "ssl-handshake-complete" ) 569 _ = status and status( handler, "ssl-handshake-complete" )
570 if self.autostart_ssl and listeners.onconnect then 570 if self.autostart_ssl and listeners.onconnect then
571 listeners.onconnect(self); 571 listeners.onconnect(self);
572 if bufferqueuelen ~= 0 then
573 _sendlistlen = addsocket(_sendlist, client, _sendlistlen)
574 end
572 end 575 end
573 _readlistlen = addsocket(_readlist, client, _readlistlen) 576 _readlistlen = addsocket(_readlist, client, _readlistlen)
574 return true 577 return true
575 else 578 else
576 if err == "wantwrite" then 579 if err == "wantwrite" then