updated copyright line

[cgilite] / cgilite.sh

diff --git a/cgilite.sh b/cgilite.sh
index 333334c460f5cae9bc763f0079584a41132f70c5..1d8d30a5af91eff5d65fb6bc60e116525a837708 100755 (executable)
--- a/cgilite.sh
+++ b/cgilite.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2017 - 2018 Paul Hänsch
+# Copyright 2017 - 2020 Paul Hänsch
 #
 # This is CGIlite.
 # A collection of posix shell functions for writing CGI scripts.
@@ -31,8 +31,10 @@ HEADER(){
   # Read value of header line. Use this instead of
   # referencing HTTP_* environment variables.
   if [ -n "${cgilite_headers+x}" ]; then
-    printf %s "$cgilite_headers" \
-    | sed -En 's;^'"${1}"': ([^\r]+)\r?$;\1;i; tX; d; :X;p;q;'
+    local h="${BR}${cgilite_headers}"
+    [ "${h##*${BR}${1}: }" = "${h}" ] && return 1
+    h="${h##*${BR}${1}: }" h="${h%%${BR}*}"
+    printf %s "${h%${CR}}"
   else
     eval "printf %s \"\$HTTP_$(printf %s "${1}" |tr a-z A-Z |tr -c A-Z _)\""
   fi
@@ -71,9 +73,13 @@ if [ -z "$REQUEST_METHOD" ]; then
     kill $cgilite_watchdog
     PATH_INFO="$(HEX_DECODE "${REQUEST_URI%\?*}")"
     QUERY_STRING="${REQUEST_URI#*\?}"
-    cgilite_headers="$(while read -r hl; do [ "${hl%${CR}}" ] && printf '%s\n' "$hl" || break; done )"
+    cgilite_headers=''; while read -r hl; do
+      [ "${hl%${CR}}" ] || break
+      cgilite_headers="${cgilite_headers}${hl}${BR}"
+    done
 
-    HTTP_CONTENT_LENGTH="$(HEADER Content-Length |grep -xE '[0-9]+')"
+    HTTP_CONTENT_LENGTH="$(HEADER Content-Length)"
+    HTTP_CONTENT_LENGTH="${HTTP_CONTENT_LENGTH##*[^0-9]}"
 
     export REMOTE_ADDR SERVER_NAME SERVER_PORT REQUEST_METHOD REQUEST_URI SERVER_PROTOCOL \
            PATH_INFO QUERY_STRING HTTP_CONTENT_LENGTH
@@ -87,15 +93,17 @@ if [ -z "$REQUEST_METHOD" ]; then
     . "$0" | while read -r l; do case $l in
       Status:*) cgilite_status="${l#Status: }";;
       Content-Length:*) cgilite_cl="${l}";;
-      $CR) printf '%s %s\r\n%s\n%s\n\r\n' \
+      $CR) printf '%s %s\r\n%s%s\n\r\n' \
              'HTTP/1.1' "${cgilite_status%${CR}}" \
-             "$cgilite_response" "${cgilite_cl}"
+             "${cgilite_response}${cgilite_response:+${BR}}" "${cgilite_cl}"
            cat || kill $$
            [ "${cgilite_cl#Connection}" = "${cgilite_cl}" ]; exit;;
       *) cgilite_response="${cgilite_response:+${cgilite_response}${BR}}${l}";;
     esac; done || exit 0;
     (sleep $cgilite_timeout && kill $$) & cgilite_watchdog=$!
   done
+  kill $cgilite_watchdog
+  exit 0
 fi
 
 if [ "$REQUEST_METHOD" = POST -a "${HTTP_CONTENT_LENGTH:=${CONTENT_LENGTH:=0}}" -gt 0 ]; then