Mercurial > prosody-hg

comparison net/server_event.lua @ 7400:f1ff321178d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 19 Apr 2016 19:00:46 +0200
parents 97fe648176ab 066a4dfdac18
children 41be97f8158f
comparison
equal deleted inserted replaced
7397:e49737de9872 7400:f1ff321178d4
516 debug "closing client after writing" 516 debug "closing client after writing"
517 interface:_close() -- close interface if needed 517 interface:_close() -- close interface if needed
518 elseif interface.startsslcallback then -- start ssl connection if needed 518 elseif interface.startsslcallback then -- start ssl connection if needed
519 debug "starting ssl handshake after writing" 519 debug "starting ssl handshake after writing"
520 interface.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, interface.startsslcallback, 0 ) 520 interface.eventstarthandshake = addevent( base, nil, EV_TIMEOUT, interface.startsslcallback, 0 )
521 elseif interface.writebuffer ~= 0 then 521 elseif interface.writebufferlen ~= 0 then
522 -- data possibly written from ondrain 522 -- data possibly written from ondrain
523 return EV_WRITE, cfg.WRITE_TIMEOUT 523 return EV_WRITE, cfg.WRITE_TIMEOUT
524 elseif interface.eventreadtimeout then 524 elseif interface.eventreadtimeout then
525 return EV_WRITE, cfg.WRITE_TIMEOUT 525 return EV_WRITE, cfg.WRITE_TIMEOUT
526 end 526 end