Software / code / prosody
Diff
net/server.lua @ 823:e0197798f5f3
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Feb 2009 13:13:54 +0000 |
| parent | 815:cf8392613f46 |
| child | 846:77244ba297ac |
line wrap: on
line diff
--- a/net/server.lua Thu Feb 19 14:10:26 2009 +0500 +++ b/net/server.lua Thu Feb 19 13:13:54 2009 +0000 @@ -369,7 +369,9 @@ end bufferqueuelen = bufferqueuelen + 1 bufferqueue[ bufferqueuelen ] = data - _writetimes[ handler ] = _writetimes[ handler ] or _currenttime + if handler then + _writetimes[ handler ] = _writetimes[ handler ] or _currenttime + end return true end handler.write = write @@ -470,7 +472,7 @@ out_put( "server.lua: client ", ip, ":", clientport, " error: ", err ) fatalerror = true disconnect( handler, err ) - handler.close( ) + _ = handler and handler.close( ) return false end end
