Software /
code /
prosody
Comparison
net/server_event.lua @ 7399:066a4dfdac18
Merge 0.9->0.10
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Tue, 19 Apr 2016 19:00:19 +0200 |
parent | 7394:a700d54c620a |
parent | 7398:206f9b0485ad |
child | 7400:f1ff321178d4 |
child | 7419:325c03f5481b |
comparison
equal
deleted
inserted
replaced
7394:a700d54c620a | 7399:066a4dfdac18 |
---|---|
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 |