From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 31 Jul 2009 23:36:15 +0000 (+0000)
Subject: luci-0.9: merge r5184-r5189
X-Git-Tag: 0.9.0~140
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e1802315458fc26a23c891a6f6f3252962f37a3a;p=oweals%2Fluci.git

luci-0.9: merge r5184-r5189
---

diff --git a/contrib/package/freifunk-watchdog/Makefile b/contrib/package/freifunk-watchdog/Makefile
index 563b5d029..7a68afb88 100644
--- a/contrib/package/freifunk-watchdog/Makefile
+++ b/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
diff --git a/contrib/package/freifunk-watchdog/src/watchdog.h b/contrib/package/freifunk-watchdog/src/watchdog.h
index 9c4d5570e..6d9ccf82c 100644
--- a/contrib/package/freifunk-watchdog/src/watchdog.h
+++ b/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) */
diff --git a/libs/cbi/luasrc/view/cbi/lvalue.htm b/libs/cbi/luasrc/view/cbi/lvalue.htm
index c6b54128f..e27948a19 100644
--- a/libs/cbi/luasrc/view/cbi/lvalue.htm
+++ b/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
diff --git a/libs/lucid-http/luasrc/lucid/http/handler/luci.lua b/libs/lucid-http/luasrc/lucid/http/handler/luci.lua
index c54e39366..1b452d768 100644
--- a/libs/lucid-http/luasrc/lucid/http/handler/luci.lua
+++ b/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, ...)
diff --git a/libs/web/luasrc/sauth.lua b/libs/web/luasrc/sauth.lua
index 8ae24a541..41681ab16 100644
--- a/libs/web/luasrc/sauth.lua
+++ b/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