diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-14 00:54:24 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-14 00:54:24 +0000 |
| commit | 2540dbba3ba74ff9a4c81890397f3db069b27968 (patch) | |
| tree | 17bc5dc1b3511e6b222aeb5d83d1d62a758d43b5 /package/uhttpd/files | |
| parent | e3198ce2ac7ff4602d1f2642e2a121f51dfff0fe (diff) | |
[package] uhttpd:
- more robust handling of network failures on static file serving
- support unlimited amount of authentication realms, listener and client sockets
- support for interpreters (.php => /usr/bin/php-cgi)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22630 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uhttpd/files')
| -rw-r--r-- | package/uhttpd/files/uhttpd.config | 7 | ||||
| -rwxr-xr-x | package/uhttpd/files/uhttpd.init | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/package/uhttpd/files/uhttpd.config b/package/uhttpd/files/uhttpd.config index 534e8f8b29..a29910a65f 100644 --- a/package/uhttpd/files/uhttpd.config +++ b/package/uhttpd/files/uhttpd.config @@ -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 diff --git a/package/uhttpd/files/uhttpd.init b/package/uhttpd/files/uhttpd.init index 8221d859bf..f8f1754e90 100755 --- a/package/uhttpd/files/uhttpd.init +++ b/package/uhttpd/files/uhttpd.init @@ -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 |