projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
net
/
server_select.lua
diff --git
a/net/server_select.lua
b/net/server_select.lua
index 37d57d29ae4afd5ffeab9960c5686d60f3c1700d..f70f81d02335fa06b44b6429fc1c4034e8e01f26 100644
(file)
--- a/
net/server_select.lua
+++ b/
net/server_select.lua
@@
-904,7
+904,7
@@
loop = function(once) -- this is the main loop of the program
end
local read, write, err = socket_select( _readlist, _sendlist, math_min(_selecttimeout, next_timer_time) )
end
local read, write, err = socket_select( _readlist, _sendlist, math_min(_selecttimeout, next_timer_time) )
- for
i
, socket in ipairs( write ) do -- send data waiting in writequeues
+ for
_
, socket in ipairs( write ) do -- send data waiting in writequeues
local handler = _socketlist[ socket ]
if handler then
handler.sendbuffer( )
local handler = _socketlist[ socket ]
if handler then
handler.sendbuffer( )
@@
-913,7
+913,7
@@
loop = function(once) -- this is the main loop of the program
out_put "server.lua: found no handler and closed socket (writelist)" -- this should not happen
end
end
out_put "server.lua: found no handler and closed socket (writelist)" -- this should not happen
end
end
- for
i
, socket in ipairs( read ) do -- receive data
+ for
_
, socket in ipairs( read ) do -- receive data
local handler = _socketlist[ socket ]
if handler then
handler.readbuffer( )
local handler = _socketlist[ socket ]
if handler then
handler.readbuffer( )