diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-23 13:15:22 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-23 13:15:22 +0000 |
commit | f589036a4facd028bf6d9ff669ee3b7e36e966f4 (patch) | |
tree | a6c7c52be230dae6d05eee1edb99a57e3cbf112e /package/uhttpd/files | |
parent | a608f942ad27ac16e9262e502c670eb3a5a1dff8 (diff) | |
download | upstream-f589036a4facd028bf6d9ff669ee3b7e36e966f4.tar.gz upstream-f589036a4facd028bf6d9ff669ee3b7e36e966f4.tar.bz2 upstream-f589036a4facd028bf6d9ff669ee3b7e36e966f4.zip |
[package] 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22366 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/files')
-rwxr-xr-x | package/uhttpd/files/uhttpd.init | 16 |
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 |