CBI: Cancelaction and event callbacks for Delegators

[project/luci.git] / libs / lucid-http / luasrc / lucid / http / server.lua

diff --git a/libs/lucid-http/luasrc/lucid/http/server.lua b/libs/lucid-http/luasrc/lucid/http/server.lua
index cb10813..284c6a0 100644 (file)
--- a/libs/lucid-http/luasrc/lucid/http/server.lua
+++ b/libs/lucid-http/luasrc/lucid/http/server.lua
@@ -198,6 +198,10 @@ function VHost.process(self, request, ...)
        -- Call URI part
        request.env.PATH_INFO = uri
        
+       if self.default and uri == "/" then
+               return 302, {Location = self.default}
+       end
+
        for k, h in pairs(self.handlers) do
                if #k > hlen then
                        if uri == k or (uri:sub(1, #k) == k and uri:byte(#k+1) == sc) then
@@ -527,7 +531,11 @@ function Server.process(self, client, env)
                        headers["Connection"] = "close"
                elseif message.env.SERVER_PROTOCOL == "HTTP/1.0" then
                        headers["Connection"] = "Keep-Alive"
-               end 
+               end
+               
+               if not close then
+                       headers["Keep-Alive"] = "timeout=5, max=50"
+               end
 
                headers["Date"] = date.to_http(os.time())
                local header = {