aboutsummaryrefslogtreecommitdiffstats
path: root/package/uhttpd/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-07-23 13:15:22 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-07-23 13:15:22 +0000
commitb688fcaa5c8aa6c3bbb08075e4204eda0ac16052 (patch)
tree66853f91f396421e88f59c4240f8a0505dff5d80 /package/uhttpd/files
parentc28ab82e0469e2c8a578f3fd40bfa10e3835290d (diff)
downloadupstream-b688fcaa5c8aa6c3bbb08075e4204eda0ac16052.tar.gz
upstream-b688fcaa5c8aa6c3bbb08075e4204eda0ac16052.tar.bz2
upstream-b688fcaa5c8aa6c3bbb08075e4204eda0ac16052.zip
uhttpd: - fix a compile warning - support custom index file names - support custom error pages (or cgi handler) - add option to disable directory listings - add REDIRECT_STATUS for CGI requests, fixes php-cgi
SVN-Revision: 22366
Diffstat (limited to 'package/uhttpd/files')
-rwxr-xr-xpackage/uhttpd/files/uhttpd.init16
1 files changed, 16 insertions, 0 deletions
diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init
index 58f980c42f..d543dd84b9 100755
--- a/package/uhttpd/files/uhttpd.init
+++ b/package/uhttpd/files/uhttpd.init
@@ -17,6 +17,17 @@ append_arg() {
[ -n "$val" -o -n "$def" ] && append UHTTPD_ARGS "$opt ${val:-$def}"
}
+append_bool() {
+ local cfg="$1"
+ local var="$2"
+ local opt="$3"
+ local def="$4"
+ local val
+
+ config_get_bool val "$cfg" "$var" "$def"
+ [ "$val" = 1 ] && append UHTTPD_ARGS "$opt"
+}
+
generate_keys() {
local cfg="$1"
local key="$2"
@@ -59,6 +70,11 @@ start_instance()
append_arg "$cfg" lua_handler "-L"
append_arg "$cfg" script_timeout "-t"
append_arg "$cfg" network_timeout "-T"
+ append_arg "$cfg" error_page "-E"
+ append_arg "$cfg" index_page "-I"
+
+ append_bool "$cfg" no_symlinks "-S" 0
+ append_bool "$cfg" no_dirlists "-D" 0
config_get http "$cfg" listen_http
for listen in $http; do