X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=index.cgi;h=021c516c38849188473d88581406b3762d7d5be6;hp=c546b9aae54475d2a4390307070b6d555fa96cfe;hb=b3455673aa27e118f55b91fe69a4b07c42dbe3a7;hpb=0bcf2131288e43e7c2ec533f1918dfd4235309aa

diff --git a/index.cgi b/index.cgi
index c546b9a..021c516 100755
--- 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