1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

[backfire] merge r22630, r22692, r22805

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22962 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow
2010-09-06 20:49:31 +00:00
parent 97974216cf
commit 752a6977d2
11 changed files with 500 additions and 360 deletions

View File

@@ -27,6 +27,13 @@ config uhttpd main
# Default is /cgi-bin
option cgi_prefix /cgi-bin
# List of extension->interpreter mappings.
# Files with an associated interpreter can
# be called outside of the CGI prefix and do
# not need to be executable.
# list interpreter ".php=/usr/bin/php-cgi"
# list interpreter ".cgi=/usr/bin/perl"
# Lua url prefix and handler script.
# Lua support is disabled if no prefix given.
# option lua_prefix /luci

View File

@@ -56,7 +56,7 @@ start_instance()
local cfg="$1"
local realm="$(uci_get system.@system[0].hostname)"
local listen http https
local listen http https interpreter path
append_arg "$cfg" home "-h"
append_arg "$cfg" realm "-r" "${realm:-OpenWrt}"
@@ -78,6 +78,11 @@ start_instance()
append UHTTPD_ARGS "-p $listen"
done
config_get interpreter "$cfg" interpreter
for path in $interpreter; 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