add a patch to provide a descent PATH to cgi,

split in 3 packages (w/o ssl, w/ matrixssl & w/ openssl), 
add a restart command to init-script.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2174 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 17 insertions, 7 deletions

diff --git a/openwrt/package/mini_httpd/files/mini_httpd-ssl.conf b/openwrt/package/mini_httpd/files/mini_httpd-ssl.conf
new file mode 100644
index 0000000000..1cd7022d54
--- /dev/null
+++ b/openwrt/package/mini_httpd/files/mini_httpd-ssl.conf
@@ -0,0 +1,7 @@
+cgipat=cgi-bin/**|**.sh
+dir=/www
+nochroot
+pidfile=/var/run/mini_httpd.pid
+user=root
+ssl
+certfile=/etc/mini_httpd.pem
diff --git a/openwrt/package/mini_httpd/files/mini_httpd.conf b/openwrt/package/mini_httpd/files/mini_httpd.conf
index 2e784520ac..d636a4378b 100644
--- a/openwrt/package/mini_httpd/files/mini_httpd.conf
+++ b/openwrt/package/mini_httpd/files/mini_httpd.conf
@@ -1,7 +1,5 @@
-cgipat=cgi-bin/*
+cgipat=cgi-bin/**|**.sh
 dir=/www
 nochroot
 pidfile=/var/run/mini_httpd.pid
 user=root
-ssl
-certfile=/etc/mini_httpd.pem
diff --git a/openwrt/package/mini_httpd/files/mini_httpd.init b/openwrt/package/mini_httpd/files/mini_httpd.init
index a6905591db..77bd6fd3b7 100644
--- a/openwrt/package/mini_httpd/files/mini_httpd.init
+++ b/openwrt/package/mini_httpd/files/mini_httpd.init
@@ -1,20 +1,25 @@
 #!/bin/sh
 
-DEFAULT=/etc/default/mini_httpd
+BIN=mini_httpd
+DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
-PID_F=$RUN_D/mini_httpd.pid
+PID_F=$RUN_D/$BIN.pid
 [ -f $DEFAULT ] && . $DEFAULT
 
 case $1 in
  start)
   [ -d $RUN_D ] || mkdir -p $RUN_D
-  mini_httpd $OPTIONS
+  $BIN $OPTIONS 2>/dev/null
   ;;
  stop)
   [ -f $PID_F ] && kill $(cat $PID_F)
   ;;
+ restart)
+  $0 stop
+  $0 start
+  ;;
  *)
-  echo "usage: $0 (start|stop)"
+  echo "usage: $0 (start|stop|restart)"
   exit 1
 esac