luci-0.9: merge r5902, r5903

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index f3473296a569ce8bbf609f4be8e208f1a6f49dc2..3de1ea38e3004db1ec3d18ec08a18c27f8f25447 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -664,6 +664,17 @@ define Package/luci-sgi-cgi/install
        $(call Package/luci/install/template,$(1),libs/sgi-cgi)
 endef
 
+define Package/luci-sgi-uhttpd
+  $(call Package/luci/webservertemplate)
+  TITLE:=Binding for the uHTTPd server
+  DEPENDS+=+uhttpd
+endef
+
+define Package/luci-sgi-uhttpd/install
+       $(call Package/luci/install/template,$(1),libs/sgi-uhttpd)
+endef
+
+
 ### Themes ###
 define Package/luci-theme-base
   $(call Package/luci/thtemplate)
@@ -1009,6 +1020,9 @@ endif
 ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),)
        PKG_SELECTED_MODULES+=libs/sgi-cgi
 endif
+ifneq ($(CONFIG_PACKAGE_luci-sgi-uhttpd),)
+       PKG_SELECTED_MODULES+=libs/sgi-uhttpd
+endif
 ifneq ($(CONFIG_PACKAGE_luci-sgi-luci),)
        PKG_SELECTED_MODULES+=libs/sgi-luci
 endif
@@ -1126,6 +1140,7 @@ $(eval $(call BuildPackage,luci-app-openvpn))
 $(eval $(call BuildPackage,luci-app-p2pblock))
 
 $(eval $(call BuildPackage,luci-sgi-cgi))
+$(eval $(call BuildPackage,luci-sgi-uhttpd))
 
 $(eval $(call BuildPackage,luci-theme-base))
 $(eval $(call BuildPackage,luci-theme-fledermaus))

diff --git a/libs/sgi-uhttpd/Makefile b/libs/sgi-uhttpd/Makefile
new file mode 100644 (file)
index 0000000..81a96f6
--- /dev/null
+++ b/libs/sgi-uhttpd/Makefile
@@ -0,0 +1,2 @@
+include ../../build/config.mk
+include ../../build/module.mk
\ No newline at end of file

diff --git a/libs/sgi-uhttpd/luasrc/sgi/uhttpd.lua b/libs/sgi-uhttpd/luasrc/sgi/uhttpd.lua
new file mode 100644 (file)
index 0000000..7008222
--- /dev/null
+++ b/libs/sgi-uhttpd/luasrc/sgi/uhttpd.lua
@@ -0,0 +1,121 @@
+--[[
+LuCI - Server Gateway Interface for the uHTTPd server
+
+Copyright 2010 Jo-Philipp Wich <xm@subsignal.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+       http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+]]--
+
+
+require "nixio.util"
+require "luci.http"
+require "luci.sys"
+require "luci.dispatcher"
+require "luci.ltn12"
+
+function handle_request(env)
+       local renv = {
+               CONTENT_LENGTH  = env.CONTENT_LENGTH,
+               CONTENT_TYPE    = env.CONTENT_TYPE,
+               REQUEST_METHOD  = env.REQUEST_METHOD,
+               REQUEST_URI     = env.REQUEST_URI,
+               PATH_INFO       = env.PATH_INFO,
+               SCRIPT_NAME     = env.SCRIPT_NAME:gsub("/+$", ""),
+               SCRIPT_FILENAME = env.SCRIPT_NAME,
+               SERVER_PROTOCOL = env.SERVER_PROTOCOL,
+               QUERY_STRING    = env.QUERY_STRING
+       }
+
+       local k, v
+       for k, v in pairs(env.headers) do
+               k = k:upper():gsub("%-", "_")
+               renv["HTTP_" .. k] = v
+       end
+
+       local len = env.CONTENT_LENGTH or 0
+       local function recv()
+               if len > 0 then
+                       local rlen, rbuf = uhttpd.recv(4096)
+                       if rlen >= 0 then
+                               len = len - rlen
+                               return rbuf
+                       end
+               end
+               return nil
+       end
+
+       local function send(...)
+               return uhttpd.send(...)
+       end
+
+       local function sendc(...)
+               if env.HTTP_VERSION > 1.0 then
+                       return uhttpd.sendc(...)
+               else
+                       return uhttpd.send(...)
+               end
+       end
+
+       local req = luci.http.Request(
+               renv, recv, luci.ltn12.sink.file(io.stderr)
+       )
+       
+
+       local x = coroutine.create(luci.dispatcher.httpdispatch)
+       local hcache = { }
+       local active = true
+
+       if env.HTTP_VERSION > 1.0 then
+               hcache["Transfer-Encoding"] = "chunked"
+       end
+
+       while coroutine.status(x) ~= "dead" do
+               local res, id, data1, data2 = coroutine.resume(x, req)
+
+               if not res then
+                       send(env.SERVER_PROTOCOL)
+                       send(" 500 Internal Server Error\r\n")
+                       send("Content-Type: text/plain\r\n\r\n")
+                       send(tostring(id))
+                       break
+               end
+
+               if active then
+                       if id == 1 then
+                               send(env.SERVER_PROTOCOL)
+                               send(" ")
+                               send(tostring(data1))
+                               send(" ")
+                               send(tostring(data2))
+                               send("\r\n")
+                       elseif id == 2 then
+                               hcache[data1] = data2
+                       elseif id == 3 then
+                               for k, v in pairs(hcache) do
+                                       send(tostring(k))
+                                       send(": ")
+                                       send(tostring(v))
+                                       send("\r\n")
+                               end
+                               send("\r\n")
+                       elseif id == 4 then
+                               sendc(tostring(data1 or ""))
+                       elseif id == 5 then
+                               active = false
+                       elseif id == 6 then
+                               data1:copyz(nixio.stdout, data2)
+                       end
+               end
+       end
+end