diff options
| -rw-r--r-- | libs/httpd/luasrc/httpd.lua | 18 | ||||
| -rw-r--r-- | libs/httpd/luasrc/httpd/server.lua | 5 |
2 files changed, 21 insertions, 2 deletions
diff --git a/libs/httpd/luasrc/httpd.lua b/libs/httpd/luasrc/httpd.lua index 201ece616..196101950 100644 --- a/libs/httpd/luasrc/httpd.lua +++ b/libs/httpd/luasrc/httpd.lua @@ -55,6 +55,24 @@ function corecv(socket, ...) 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 diff --git a/libs/httpd/luasrc/httpd/server.lua b/libs/httpd/luasrc/httpd/server.lua index 7bfac6862..9ec8961b8 100644 --- 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 = { - 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 ) @@ -206,7 +207,7 @@ function Server.process( self, client ) end - local sinkout = socket.sink(sinkmode, client) + local sinkout = socket.sink(sinkmode, thread) local header = message.env.SERVER_PROTOCOL .. " " .. |