prosody
861a747e441b
net/server_event.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

net/server_event.lua @ 7690:861a747e441b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 08 Oct 2016 21:07:12 +0200
parent 7422:41be97f8158f
parent 7688:88ad2d5bcf80
child 7810:cdb5dd9f35c0
comparison
equal deleted inserted replaced
7687:ae24deae6488 7690:861a747e441b
559 --vdebug( "leaving this event because:", tostring(interface.noreading or interface.fatalerror) ) 559 --vdebug( "leaving this event because:", tostring(interface.noreading or interface.fatalerror) )
560 interface.eventread = nil 560 interface.eventread = nil
561 return -1 561 return -1
562 end 562 end
563 if EV_TIMEOUT == event and not interface.conn:dirty() and interface:onreadtimeout() ~= true then 563 if EV_TIMEOUT == event and not interface.conn:dirty() and interface:onreadtimeout() ~= true then
564 interface.fatalerror = "timeout during receiving"
565 debug( "connection failed:", interface.fatalerror )
566 interface:_close()
567 interface.eventread = nil
564 return -1 -- took too long to get some data from client -> disconnect 568 return -1 -- took too long to get some data from client -> disconnect
565 end 569 end
566 if interface._usingssl then -- handle luasec 570 if interface._usingssl then -- handle luasec
567 if interface.eventwritetimeout then -- ok, in the past writecallback was regged 571 if interface.eventwritetimeout then -- ok, in the past writecallback was regged
568 local ret = interface.writecallback( ) -- call it 572 local ret = interface.writecallback( ) -- call it