luci-0.9: merge r5184-r5189

contrib/package/freifunk-watchdog/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freifunk-watchdog
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_BUILD_DEPENDS := uci

contrib/package/freifunk-watchdog/src/watchdog.h

@@ -66,7 +66,7 @@
 #define WATCH_KEEPALIVE	'\0'
 
 /* System load error action and treshold */
-#define LOAD_TRESHOLD	5.00
+#define LOAD_TRESHOLD	15.00
 #define LOAD_ACTION		"/sbin/reboot"
 
 /* Fallback binary name (passed by makefile) */

libs/cbi/luasrc/view/cbi/lvalue.htm

@@ -16,7 +16,7 @@ $Id$
 <% if self.widget == "select" then %>
 	<select class="cbi-input-select" onchange="cbi_d_update(this.id)"<%= attr("id", cbid) .. attr("name", cbid) .. ifattr(self.size, "size") %>>
 	<% for i, key in pairs(self.keylist) do -%>
-		<option id="cbi-<%=self.config.."-"..section.."-"..self.option.."-"..key%>"<%= attr("value", key) .. ifattr(self:cfgvalue(section) == key, "selected", "selected") %>><%=striptags(self.vallist[i])%></option>
+		<option id="cbi-<%=self.config.."-"..section.."-"..self.option.."-"..key%>"<%= attr("value", key) .. ifattr((self:cfgvalue(section) or self.default) == key, "selected", "selected") %>><%=striptags(self.vallist[i])%></option>
 	<%- end %>
 	</select>
 <% elseif self.widget == "radio" then

libs/lucid-http/luasrc/lucid/http/handler/luci.lua

@@ -26,6 +26,7 @@ Luci = util.class(srv.Handler)
 function Luci.__init__(self, name, prefix)
 	srv.Handler.__init__(self, name)
 	self.prefix = prefix
+	dsp.indexcache = "/tmp/luci-indexcache"
 end
 
 function Luci.handle_HEAD(self, ...)

libs/web/luasrc/sauth.lua

@@ -57,7 +57,7 @@ end
 -- @param id	Session identifier
 -- @return		Session data
 function read(id)
-	if not id then
+	if not id or #id == 0 then
 		return
 	end
 	if not id:match("^%w+$") then