From: paul Date: Wed, 13 Apr 2016 10:48:11 +0000 (+0000) Subject: change precedence in processing static, action, and page X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=8229687681aafa7941e0c440544e5852ad1c932c;p=clickslide change precedence in processing static, action, and page svn path=/trunk/; revision=26 --- diff --git a/index.cgi b/index.cgi index f35a5bd..d83cb2a 100755 --- a/index.cgi +++ b/index.cgi @@ -42,12 +42,12 @@ _EXEC="${real%/shcgi/index.cgi}" #execution directory ACTION=$(validate "${ACTION:-${_GET[action]}}" '[a-zA-Z0-9_-]+' '') STATIC=$(invalidate "${STATIC:-${_GET[static]}}" '(^|.*/)\.\./.*' '') -if [ -n "$PAGE" -a -x "${_EXEC}/pages/${PAGE}.sh" ]; then - . "$_EXEC/shcgi/page.sh" +if [ -n "$STATIC" -a -e "${_EXEC}/static/${STATIC}" ]; then + . "$_EXEC/shcgi/static.sh" elif [ -n "$ACTION" -a -x "${_EXEC}/actions/${ACTION}.sh" ]; then . "${_EXEC}/actions/${ACTION}.sh" -elif [ -n "$STATIC" -a -e "${_EXEC}/static/${STATIC}" ]; then - . "$_EXEC/shcgi/static.sh" +elif [ -n "$PAGE" -a -x "${_EXEC}/pages/${PAGE}.sh" ]; then + . "$_EXEC/shcgi/page.sh" else printf 'HTTP/1.1 404 Not Found\r\n' PAGE=error