CBI: Cancelaction and event callbacks for Delegators

LuCId: Send Keep-Alive headers to avoid browser quirks

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 1b22db0a8adf5a3837e9cd28120f2e90dfdc2ad4..13aad8d9eccbca333e3be717986a26c4c0d85442 100644 (file)
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -506,6 +506,7 @@ function Delegator.__init__(self, ...)
        self.pageaction = false
        self.readinput = true
        self.allow_reset = false
+       self.allow_cancel = false
        self.allow_back = false
        self.allow_finish = false
        self.template = "cbi/delegator"
@@ -559,6 +560,17 @@ function Delegator.get(self, name)
 end
 
 function Delegator.parse(self, ...)
+       if self.allow_cancel and Map.formvalue(self, "cbi.cancel") then
+               if self.on_cancel then
+                       self:on_cancel()
+                       return FORM_DONE
+               end
+       end
+       
+       if self.on_init and not Map.formvalue(self, "cbi.delg.current") then
+               self:on_init()
+       end
+
        local newcurrent
        self.chain = self.chain or self:get_chain()
        self.current = self.current or self:get_active()
@@ -587,6 +599,9 @@ function Delegator.parse(self, ...)
        if not Map.formvalue(self, "cbi.submit") then
                return FORM_NODATA
        elseif not newcurrent or not self:get(newcurrent) then
+               if self.on_done then
+                       self:on_done()
+               end
                return FORM_DONE
        else
                self.current = newcurrent

diff --git a/libs/cbi/luasrc/view/cbi/delegator.htm b/libs/cbi/luasrc/view/cbi/delegator.htm
index 95fd270f8b1997ea793fec8b39e09aca02ecfc00..f2c87b460bd6248ce67035cd169ce691fcf6cce7 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/delegator.htm
+++ b/libs/cbi/luasrc/view/cbi/delegator.htm
@@ -23,6 +23,9 @@ $Id$
 <% if self.allow_reset then %>
                <input class="cbi-button cbi-button-reset" type="reset" value="<%:reset%>" />
 <% end %>
+<% if self.allow_cancel then %>
+               <input class="cbi-button cbi-button-cancel" type="submit" name="cbi.cancel" value="<%:cancel%>" />
+<% end %>
 <% if self.allow_finish and not self:get_next(self.current) then %>
        <input class="cbi-button cbi-button-finish" type="submit" value="<%:cbi_finish Finish%>" />
 <% elseif self:get_next(self.current) then %>

diff --git a/libs/lucid-http/luasrc/lucid/http/server.lua b/libs/lucid-http/luasrc/lucid/http/server.lua
index 450417995d222e3daf448086cc060a4aac96e739..284c6a03ed8959bc5d265ef4b1888ef2e93b414a 100644 (file)
--- a/libs/lucid-http/luasrc/lucid/http/server.lua
+++ b/libs/lucid-http/luasrc/lucid/http/server.lua
@@ -419,8 +419,8 @@ function Server.process(self, client, env)
                set_memory_limit(env.config.memlimit)
        end
 
-       client:setsockopt("socket", "rcvtimeo", 60)
-       client:setsockopt("socket", "sndtimeo", 60)
+       client:setsockopt("socket", "rcvtimeo", 5)
+       client:setsockopt("socket", "sndtimeo", 5)
        
        repeat
                -- parse headers
@@ -531,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 = {