in server mode: serve static files from data dir

svn path=/trunk/; revision=36

diff --git a/index.cgi b/index.cgi
index c546b9aae54475d2a4390307070b6d555fa96cfe..021c516c38849188473d88581406b3762d7d5be6 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -28,13 +28,13 @@ real="$(readlink -f $call)"
 export _DATA="$(dirname "$call")"  #storage directory
 export _EXEC="${real%/shcgi/index.cgi}"  #execution directory
 
+. "$_EXEC/shcgi/misc.sh"
+
 if [ "$1" = '--server' -o  "$1" = '--inetd' -o "$1" = '--ncat' ]; then
   . "$_EXEC/shcgi/server.sh" $@
 else
   HTTP_format(){ cat }
 fi
-  
-. "$_EXEC/shcgi/misc.sh"
 
 # put debug options in the local.opts file
 . "$_EXEC/shcgi/debug.sh"
@@ -49,7 +49,7 @@ ACTION=$(validate "${ACTION:-${_GET[action]}}" '[a-zA-Z0-9_-]+' '')
 STATIC=$(invalidate "${STATIC:-${_GET[static]}}" '(^|.*/)\.\./.*' '')
 
 if [ -n "$STATIC" -a -e "${_EXEC}/static/${STATIC}" ]; then
-  . "$_EXEC/shcgi/static.sh"
+  . "$_EXEC/shcgi/static.sh" "$_EXEC/static/$STATIC"
 elif [ -n "$ACTION" -a -x "${_EXEC}/actions/${ACTION}.sh" ]; then
   . "${_EXEC}/actions/${ACTION}.sh"
 elif   [ -n "$PAGE"   -a -x "${_EXEC}/pages/${PAGE}.sh" ]; then

diff --git a/server.sh b/server.sh
index dc97607e3f41475325d7d1e15b5302e9acf0a83a..4eb253ffe2696f5ac5be0b60be18d91da74b2511 100755 (executable)
--- a/server.sh
+++ b/server.sh
@@ -84,3 +84,10 @@ HTTP_format(){
   bX
   '
 }
+
+PATH_INFO="$(invalidate "${PATH_INFO}" '(^|.*/)\.\./.*' '')"
+
+if [ -z "$QUERY_STRING" -a -f "$_DATA/$PATH_INFO" ]; then
+  . "$_EXEC/shcgi/static.sh" "$_DATA/$PATH_INFO"
+  exit 0
+fi |HTTP_format

diff --git a/static.sh b/static.sh
index e8de7d16dc727bdaf18170f59cf261862173b6dd..ec860c6efb3a8a10158a1233ad7fdebcd5ce2eda 100755 (executable)
--- a/static.sh
+++ b/static.sh
@@ -19,7 +19,7 @@
 
 
 unset length date file suffix
-file="$_EXEC/static/$STATIC"
+file="$1"
 date="$(stat -c %Y "$file")"
 
 # allow overriding magic file recognition