* luci/httpd: Handle timeouts on socket writes correctly

diff --git a/libs/httpd/luasrc/httpd.lua b/libs/httpd/luasrc/httpd.lua
index 201ece6..1961019 100644 (file)
--- a/libs/httpd/luasrc/httpd.lua
+++ b/libs/httpd/luasrc/httpd.lua
@@ -55,6 +55,24 @@ function corecv(socket, ...)
        end
 end
 
        end
 end
 

+function cosend(socket, chunk, i, ...)
+       threadi[socket] = true
+       i = i or 1
+
+       while true do
+               local stat, err, sent = socket:send(chunk, i, ...)
+
+               if err ~= "timeout" then
+                       threadi[socket] = false
+                       return stat, err, sent
+               else
+                       i = sent and (sent + 1) or 1 
+               end
+ 
+               coroutine.yield()
+       end
+end
+

 function register(socket, s_clhandler, s_errhandler)
        table.insert(reading, socket)
        clhandler[socket] = s_clhandler
 function register(socket, s_clhandler, s_errhandler)
        table.insert(reading, socket)
        clhandler[socket] = s_clhandler

diff --git a/libs/httpd/luasrc/httpd/server.lua b/libs/httpd/luasrc/httpd/server.lua
index 7bfac68..9ec8961 100644 (file)
--- a/libs/httpd/luasrc/httpd/server.lua
+++ b/libs/httpd/luasrc/httpd/server.lua
@@ -111,7 +111,8 @@ function Server.process( self, client )
 
        -- Setup sockets and sources
        local thread = {
 
        -- Setup sockets and sources
        local thread = {

-               receive = function(self, ...) return luci.httpd.corecv(client, ...) end
+               receive = function(self, ...) return luci.httpd.corecv(client, ...) end,
+               send = function(self, ...) return luci.httpd.cosend(client, ...) end

        }
        
        client:settimeout( 0 )
        }
        
        client:settimeout( 0 )


@@ -206,7 +207,7 @@ function Server.process( self, client )
                end
                
                
                end
                
                

-               local sinkout = socket.sink(sinkmode, client)
+               local sinkout = socket.sink(sinkmode, thread)

                
                local header =
                        message.env.SERVER_PROTOCOL .. " " ..
                
                local header =
                        message.env.SERVER_PROTOCOL .. " " ..