Mercurial > prosody-hg
comparison net/server_event.lua @ 7688:88ad2d5bcf80
net.server_event: Restore destruction of socket on read timeout (lost since e67891ad18d6) (thanks Ge0rG)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 08 Oct 2016 14:07:07 +0200 |
| parents | 3fc5560557a5 |
| children | 861a747e441b 34ca48325ce7 |
comparison
equal
deleted
inserted
replaced
| 7685:8e43a05e2374 | 7688:88ad2d5bcf80 |
|---|---|
| 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 |