* libs/core: Moved ltn12 inside LuCI to avoid package conflicts with luasocket

[project/luci.git] / libs / sgi-webuci / luasrc / sgi / webuci.lua

diff --git a/libs/sgi-webuci/luasrc/sgi/webuci.lua b/libs/sgi-webuci/luasrc/sgi/webuci.lua
index 7bfa2fe13c96e8dbdcaffe036881e7c8f5e4ee1e..3e60575e0b5dbbf841d47ce1f812a58c5a9ec705 100644 (file)
--- a/libs/sgi-webuci/luasrc/sgi/webuci.lua
+++ b/libs/sgi-webuci/luasrc/sgi/webuci.lua
@@ -24,15 +24,23 @@ limitations under the License.
 
 ]]--
 module("luci.sgi.webuci", package.seeall)
+local ltn12 = require("luci.ltn12")
 require("luci.http")
 require("luci.util")
 require("luci.dispatcher")
 
 function run(env, vars)
-       local r = luci.http.Request(env, {}, io.stderr)
+       local r = luci.http.Request(
+               env,
+               ltn12.source.empty(),
+               ltn12.sink.file(io.stderr)
+       )
+       
        r.message.params = vars
        
        local x = coroutine.create(luci.dispatcher.httpdispatch)
+       local status = ""
+       local headers = {}
        
        while coroutine.status(x) ~= "dead" do
                local res, id, data1, data2 = coroutine.resume(x, r)
@@ -45,11 +53,15 @@ function run(env, vars)
                end
                
                if id == 1 then
-                       io.write(env.SERVER_PROTOCOL .. " " .. tostring(data1) .. " " .. data2 .. "\n")
+                       status = env.SERVER_PROTOCOL .. " " .. tostring(data1) .. " " .. data2 .. "\r\n"
                elseif id == 2 then
-                       io.write(data1 .. ": " .. data2 .. "\n")
+                       headers[data1] = data2
                elseif id == 3 then
-                       io.write("\n")
+                       io.write(status)
+                       for k, v in pairs(headers) do
+                               io.write(k .. ": " .. v .. "\r\n")
+                       end
+                       io.write("\r\n")
                elseif id == 4 then
                        io.write(data1)
                end