* Generalized HTTP-API

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

diff --git a/libs/sgi-wsapi/luasrc/sgi/wsapi.lua b/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
index e7082493c6245173ef85d20ba0b536d681f00434..f77ac5c5bce7700fd8f5ffc684c214c26a6ab302 100644 (file)
--- a/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
+++ b/libs/sgi-wsapi/luasrc/sgi/wsapi.lua
@@ -26,13 +26,12 @@ limitations under the License.
 module("luci.sgi.wsapi", package.seeall)
 require("luci.http")
 require("luci.dispatcher")
-require("wsapi.request")
+require("luci.http.protocol")
 
 function run(wsapi_env)
-       local r = luci.http.Request()
-       r.env = wsapi_env
-       r.request = wsapi.request.parse_post_data(wsapi_env,
-               wsapi.request.parse_qs(wsapi_env.QUERY_STRING))
+       local r = luci.http.Request(wsapi_env, wsapi_env.input, wsapi_env.error)
+       r.postds = function() return wsapi.request.parse_post_data(wsapi_env) end
+       r.getds  = function() return wsapi.request.parse_qs(wsapi_env.QUERY_STRING) end
                
        local res, id, data1, data2 = true, 0, nil, nil
        local headers = {}