Unify header function for use with external web servers

diff --git a/cgilite.sh b/cgilite.sh
index b90899344f849fb5e71f262a630ee1482e1aeadf..634889dd7524416352f6c6ad17eda5806b54b02a 100755 (executable)
--- a/cgilite.sh
+++ b/cgilite.sh
@@ -25,6 +25,15 @@ setopt -o OCTAL_ZEROES 2>&-
 BR="$(printf '\n')"
 CR="$(printf '\r')"
 
+HEADER(){
+  if [ -n "$cgilite_headers+x" ]; then
+    printf %s "$cgilite_headers" \
+    | sed -rn 's;^'"${1}"': ([^\r]+)\r?$;\1;ip;q;'
+  else
+    eval $(printf 'printf $HTTP_'; printf '%s' "${1}" |tr '[a-z]-' '[A-Z]_')
+  fi
+}
+
 if [ "$1" = '--inetd' -a -z "$REQUEST_METHOD" ]; then
   REMOTE_ADDR="${TCPREMOTEIP:-$NCAT_REMOTE_ADDR}"
   SERVER_NAME="${TCPLOCALIP:-$NCAT_LOCAL_ADDR}"
@@ -35,10 +44,8 @@ if [ "$1" = '--inetd' -a -z "$REQUEST_METHOD" ]; then
   QUERY_STRING="${REQUEST_URI#*\?}"
   cgilite_headers="$(sed -u '/^\r\?$/q')"
 
-  HTTP_CONTENT_LENGTH="$(printf %s "$cgilite_headers" |grep -oiE '^Content-Length: [0-9]+')"
-  HTTP_CONTENT_LENGTH="${HTTP_CONTENT_LENGTH#*: }"
-  HTTP_COOKIE="$(printf %s "$cgilite_headers" |grep -oiE '^Cookie: [^\r]+')"
-  HTTP_COOKIE="${HTTP_COOKIE#*: }"
+  HTTP_CONTENT_LENGTH="$(HEADER Content-Length |grep -xE '[0-9]+')"
+  HTTP_COOKIE="$(HEADER Cookie)"
 
   export REMOTE_ADDR SERVER_NAME SERVER_PORT REQUEST_METHOD REQUEST_URI SERVER_PROTOCOL \
          PATH_INFO QUERY_STRING HTTP_CONTENT_LENGTH HTTP_COOKIE
@@ -52,6 +59,8 @@ if [ "$REQUEST_METHOD" = POST -a "${HTTP_CONTENT_LENGTH:=${CONTENT_LENGTH:=0}}"
   cgilite_post="$(head -c "$HTTP_CONTENT_LENGTH")"
 fi
 
+[ -n "${DEBUG+x}" ] && env
+
 cgilite_count(){
   case $1 in
     GET)  printf %s "&${QUERY_STRING}";;
@@ -90,15 +99,10 @@ POST_COUNT(){ cgilite_count POST $1; }
 REF(){ cgilite_value REF $@; }
 REF_COUNT(){ cgilite_count REF $1; }
 
-HEADER(){
-  printf %s "$cgilite_headers" \
-  | sed -rn '/^'"${1}"': /{s;^[^:]+: ([^\r]+)\r?$;\1;p;q;}'
-}
-
 COOKIE(){
   printf "$(
-    printf %s " ${HTTP_COOKIE}" \
-    | grep -Eo '[; ]'"$1"'=[^;]*' \
+    HEADER Cookie \
+    | grep -oE '(^|; ?)'"$1"'=[^;]*' \
     | sed -rn "${2:-1}"'{s;^[^=]+=;;; s;\+; ;g; s;\\;\\\\;g;
       # Hexadecimal { %00 - %FF } will be transformed to octal { \000 - \377 } for posix printf
       s;%[0123].;&\\0;g; s;%[4567].;&\\1;g; s;%[89AB].;&\\2;g; s;%[CDEF].;&\\3;g;
@@ -110,6 +114,10 @@ COOKIE(){
   )"
 }
 
+COOKIE foo
+echo
+COOKIE bar
+
 HTML(){
   # HTML Entity Coding
   # Prints UTF-8 string as decimal Unicode Code Points