diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-10-30 13:22:03 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-10-30 13:22:03 +0000 |
| commit | f4db5214d73892406288c688302fcf3d56d6ac10 (patch) | |
| tree | 530925e8398f719810837b32990b2d1872156aa1 /package/uhttpd/files/uhttpd.init | |
| parent | 70c281419f78b738cc12c2f6338ab8178a7d22e5 (diff) | |
| download | upstream-f4db5214d73892406288c688302fcf3d56d6ac10.tar.gz upstream-f4db5214d73892406288c688302fcf3d56d6ac10.tar.bz2 upstream-f4db5214d73892406288c688302fcf3d56d6ac10.zip | |
AA: uhttpd: backport trunk changes
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34011 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/files/uhttpd.init')
| -rwxr-xr-x | package/uhttpd/files/uhttpd.init | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init index 379a9f5b5f..ad46d2c9b7 100755 --- a/package/uhttpd/files/uhttpd.init +++ b/package/uhttpd/files/uhttpd.init @@ -59,7 +59,7 @@ start_instance() local cfg="$1" local realm="$(uci_get system.@system[0].hostname)" - local listen http https interpreter path + local listen http https interpreter indexes path append_arg "$cfg" home "-h" append_arg "$cfg" realm "-r" "${realm:-OpenWrt}" @@ -71,7 +71,6 @@ start_instance() append_arg "$cfg" network_timeout "-T" append_arg "$cfg" tcp_keepalive "-A" append_arg "$cfg" error_page "-E" - append_arg "$cfg" index_page "-I" append_arg "$cfg" max_requests "-n" 3 append_bool "$cfg" no_symlinks "-S" 0 @@ -88,6 +87,11 @@ start_instance() append UHTTPD_ARGS "-i $path" done + config_get indexes "$cfg" index_page + for path in $indexes; do + append UHTTPD_ARGS "-I $path" + done + config_get https "$cfg" listen_https config_get UHTTPD_KEY "$cfg" key /etc/uhttpd.key config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt |