Merge branch 'master' of git.plutz.net:cgilite

[cgilite] / cgilite.sh

diff --git a/cgilite.sh b/cgilite.sh
index 996fe9daa4befceac6e7461b7e4755e03feebe9c..a84de140c97867d1a1fc074ac252e390dbf22c7c 100755 (executable)
--- a/cgilite.sh
+++ b/cgilite.sh
@@ -22,8 +22,9 @@
 # set -o posix # ksh, not portable
 setopt -o OCTAL_ZEROES 2>&-
 
-BR="$(printf '\n')"
-CR="$(printf '\r')"
+CR="\r"
+BR='
+'
 cgilite_timeout=2
 
 HEADER(){
@@ -48,7 +49,7 @@ HEX_DECODE='
 '
 
 HEX_DECODE(){
-  printf "$(printf %s "$1" |sed -r "$HEX_DECODE")"
+  printf -- "$(printf %s "$1" |sed -r "$HEX_DECODE")"
 }
 
 if [ -z "$REQUEST_METHOD" ]; then
@@ -70,7 +71,7 @@ if [ -z "$REQUEST_METHOD" ]; then
     kill $cgilite_watchdog
     PATH_INFO="$(HEX_DECODE "${REQUEST_URI%\?*}")"
     QUERY_STRING="${REQUEST_URI#*\?}"
-    cgilite_headers="$(sed -u '/^\r\?$/q')"
+    cgilite_headers="$(while read -r hl; do [ "${hl%${CR}}" ] && printf '%s\n' "$hl" || break; done )"
 
     HTTP_CONTENT_LENGTH="$(HEADER Content-Length |grep -xE '[0-9]+')"
 
@@ -91,7 +92,7 @@ if [ -z "$REQUEST_METHOD" ]; then
              "$cgilite_response" "${cgilite_cl}"
            cat
            [ "${cgilite_cl#Connection}" = "${cgilite_cl}" ]; exit;;
-      *) cgilite_response="$cgilite_response${BR}$l";;
+      *) cgilite_response="${cgilite_response:+${cgilite_response}${BR}}${l}";;
     esac; done || exit 0;
     (sleep $cgilite_timeout && kill $$) & cgilite_watchdog=$!
   done
@@ -115,7 +116,7 @@ cgilite_value(){
     str=${str#*&${name}=}
     cnt=$((cnt - 1))
   done
-  printf "$(printf %s "${str%%&*}" |sed -r 's;\+; ;g;'"$HEX_DECODE")"
+  printf -- "$(printf %s "${str%%&*}" |sed -r 's;\+; ;g;'"$HEX_DECODE")"
 }
 
 GET(){ cgilite_value "${QUERY_STRING}" $@; }