From 36e143f8304389d2de1f08cb738a83c5e23265e5 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 14 Aug 2010 00:54:24 +0000
Subject: [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
---
 package/uhttpd/files/uhttpd.config | 7 +++++++
 package/uhttpd/files/uhttpd.init   | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'package/uhttpd/files')

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
-- 
cgit v1.2.3