# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1269520425 0
# Node ID 29ec7cd77f81420c154da112cf493fa2cdb90090
# Parent  7486b921687926111780f593f466dced3ed4299c# Parent  a2b01936f8f9175215596623fa5dcbb46b3338e1
Merge 0.7->trunk

diff -r 7486b9216879 -r 29ec7cd77f81 net/server_event.lua
--- a/net/server_event.lua	Wed Mar 24 22:48:12 2010 +0000
+++ b/net/server_event.lua	Thu Mar 25 12:33:45 2010 +0000
@@ -535,7 +535,7 @@
 					end
 					interface.eventwrite = nil
 					return -1
-				elseif byte then  -- want write again
+				elseif byte and (err == "timeout" or err == "wantwrite") then  -- want write again
 					--vdebug( "writebuffer is not empty:", err )
 					interface.writebuffer = string_sub( interface.writebuffer, byte + 1, interface.writebufferlen )  -- new buffer
 					interface.writebufferlen = interface.writebufferlen - byte