From b4afadf46825c28910365f4e6dce5ec20f6e1341 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Thu, 19 Nov 2020 02:32:51 +0100 Subject: [PATCH] Squashed 'cgilite/' changes from 147c722..a1caf91 a1caf91 include guard for main script, prevent double read of post data git-subtree-dir: cgilite git-subtree-split: a1caf91a5e6ab2d13790ec6a0c1eaf2b4030a0e8 --- cgilite.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cgilite.sh b/cgilite.sh index e145f2e..f766ee2 100755 --- a/cgilite.sh +++ b/cgilite.sh @@ -18,6 +18,9 @@ # You should have received a copy of the GNU Affero General Public License # along with CGIlite. If not, see . +[ -n "$include_cgilite" ] && return 0 +# guard set after webserver part + # ksh and zsh workaround # set -o posix # ksh, not portable setopt -o OCTAL_ZEROES 2>&- @@ -27,8 +30,6 @@ BR=' ' cgilite_timeout=2 -debug(){ [ $# -gt 0 ] && printf '%s\n' "$@" >&2 || tee -a /dev/stderr; } - PATH(){ local str seg out [ $# -eq 0 ] && str="$(cat)" || str="$*" @@ -121,11 +122,14 @@ if [ -z "$REQUEST_METHOD" ]; then exit 0 fi +include_cgilite="$0" + if [ "${REQUEST_METHOD}" = POST -a "${CONTENT_LENGTH:-0}" -gt 0 -a \ "${CONTENT_TYPE}" = "application/x-www-form-urlencoded" ]; then cgilite_post="$(head -c "$CONTENT_LENGTH")" fi +debug(){ [ $# -gt 0 ] && printf '%s\n' "$@" >&2 || tee -a /dev/stderr; } [ "${DEBUG+x}" ] && env >&2 cgilite_count(){ -- 2.39.2