Renamed reworked UCI API to uci2 to allow a peaceful coexistence with the old one

Minor bugfixes

2 files changed, 3 insertions, 7 deletions

diff --git a/libs/httpd/host/runluci b/libs/httpd/host/runluci
index 5a7e8fd6f..f150cae8d 100755
--- a/libs/httpd/host/runluci
+++ b/libs/httpd/host/runluci
@@ -17,9 +17,9 @@ vhost   = luci.httpd.server.VHost()
 
 server:set_default_vhost(vhost)
 
-if pcall(require, "uci") and pcall(require, "luci.model.uci") then
-	luci.model.uci.cursor = function(config, ...)
-		return uci.cursor(config or SYSROOT .. "/etc/config", ...)
+if pcall(require, "uci2") and pcall(require, "luci.model.uci") then
+	luci.model.uci.cursor = function(config, save)
+		return uci2.cursor(config or SYSROOT .. "/etc/config", save or SYSROOT .. "/tmp/.uci")
 	end
 end
 
diff --git a/libs/httpd/luasrc/httpd/handler/luci.lua b/libs/httpd/luasrc/httpd/handler/luci.lua
index ac3ed78d0..320ab4c10 100644
--- a/libs/httpd/luasrc/httpd/handler/luci.lua
+++ b/libs/httpd/luasrc/httpd/handler/luci.lua
@@ -93,9 +93,5 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
 		end
 	end
 
-	headers["Expires"] = luci.http.protocol.date.to_http( os.time() )
-	headers["Date"]    = headers["Expires"]
-	headers["Cache-Control"] = "no-cache"
-
 	return Response(status, headers), iter
 end