prosody
3d950ee0de35
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 @ 7505:3d950ee0de35

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 14 Jul 2016 13:41:02 +0200
parent 7477:f9e470026042
parent 7501:8c3d93b67560
child 7530:f14094d10925
comparison
equal deleted inserted replaced
7497:22942eda53f8 7505:3d950ee0de35
560 function handler.set_sslctx(self, new_sslctx) 560 function handler.set_sslctx(self, new_sslctx)
561 sslctx = new_sslctx; 561 sslctx = new_sslctx;
562 local read, wrote 562 local read, wrote
563 handshake = coroutine_wrap( function( client ) -- create handshake coroutine 563 handshake = coroutine_wrap( function( client ) -- create handshake coroutine
564 local err 564 local err
565 for i = 1, _maxsslhandshake do 565 for _ = 1, _maxsslhandshake do
566 _sendlistlen = ( wrote and removesocket( _sendlist, client, _sendlistlen ) ) or _sendlistlen 566 _sendlistlen = ( wrote and removesocket( _sendlist, client, _sendlistlen ) ) or _sendlistlen
567 _readlistlen = ( read and removesocket( _readlist, client, _readlistlen ) ) or _readlistlen 567 _readlistlen = ( read and removesocket( _readlist, client, _readlistlen ) ) or _readlistlen
568 read, wrote = nil, nil 568 read, wrote = nil, nil
569 _, err = client:dohandshake( ) 569 _, err = client:dohandshake( )
570 if not err then 570 if not err then