* libs/httpd: Added Cache-Control header to LuCI

* libs/httpd: Added Server-Header

diff --git a/libs/httpd/luasrc/httpd/handler/luci.lua b/libs/httpd/luasrc/httpd/handler/luci.lua
index 4a83de1a4c93afec35d327d7f61bdd346a01d34d..17882e258bc3487ba78d9fc8a9317294d9823ec8 100644 (file)
--- a/libs/httpd/luasrc/httpd/handler/luci.lua
+++ b/libs/httpd/luasrc/httpd/handler/luci.lua
@@ -66,7 +66,12 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
                        headers[data1] = data2
                end
        end
+<<<<<<< HEAD:libs/httpd/luasrc/httpd/handler/luci.lua
 
+=======
+       
+       
+>>>>>>> * libs/httpd: Added Cache-Control header to LuCI:libs/httpd/luasrc/httpd/handler/luci.lua
        local function iter()
                local res, id, data = coroutine.resume(x)
                if not res then
@@ -82,6 +87,7 @@ function Luci.handle_get(self, request, sourcein, sinkerr)
 
        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

diff --git a/libs/httpd/luasrc/httpd/server.lua b/libs/httpd/luasrc/httpd/server.lua
index e5b862032cdaae66ef8a75a05bcfbdc395a623be..7bfac68629bbe0ac7a4e69c695ad68bed6d9b6bd 100644 (file)
--- a/libs/httpd/luasrc/httpd/server.lua
+++ b/libs/httpd/luasrc/httpd/server.lua
@@ -20,6 +20,7 @@ require("socket.http")
 require("luci.util")
 
 READ_BUFSIZE = 1024
+VERSION = 0.2
 
 
 VHost = luci.util.class()
@@ -212,6 +213,8 @@ function Server.process( self, client )
                        tostring(response.status) .. " " ..
                        luci.http.protocol.statusmsg[response.status] .. "\r\n"
 
+               header = header .. "Server: LuCI HTTPd/" .. tostring(VERSION) .. "\r\n"
+
                
                for k,v in pairs(response.headers) do
                        header = header .. k .. ": " .. v .. "\r\n"