prosody
ab68bb837fe0
net/server_select.lua
Software / code / prosody
Comparison
net/server_select.lua @ 6465:ab68bb837fe0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 05 Oct 2014 15:37:46 +0200 |
| parent | 6442:0f4025abbe8f |
| parent | 6459:ba421af3dfd3 |
| child | 6481:dbc72cd1332e |
comparison
equal
deleted
inserted
replaced
| 6456:a8d9d3eea6f4 | 6465:ab68bb837fe0 |
|---|---|
| 886 for handler, timestamp in pairs( _readtimes ) do | 886 for handler, timestamp in pairs( _readtimes ) do |
| 887 if os_difftime( _currenttime - timestamp ) > _readtimeout then | 887 if os_difftime( _currenttime - timestamp ) > _readtimeout then |
| 888 if not(handler.onreadtimeout) or handler:onreadtimeout() ~= true then | 888 if not(handler.onreadtimeout) or handler:onreadtimeout() ~= true then |
| 889 handler.disconnect( )( handler, "read timeout" ) | 889 handler.disconnect( )( handler, "read timeout" ) |
| 890 handler:close( ) -- forced disconnect? | 890 handler:close( ) -- forced disconnect? |
| 891 else | |
| 892 _readtimes[ handler ] = _currenttime -- reset timer | |
| 891 end | 893 end |
| 892 end | 894 end |
| 893 end | 895 end |
| 894 end | 896 end |
| 895 | 897 |
