prosody
606fb325d788
net/server.lua

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

Software / code / prosody

Diff

net/server.lua @ 821:606fb325d788

Automated merge with http://waqas.ath.cx:8000/
author Matthew Wild <mwild1@gmail.com>
date Wed, 18 Feb 2009 21:02:41 +0000 (2009-02-18)
parent 815:cf8392613f46
child 846:77244ba297ac
line wrap: on
line diff
--- a/net/server.lua	Thu Feb 19 02:01:31 2009 +0500
+++ b/net/server.lua	Wed Feb 18 21:02:41 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