bugfix: allow positive return of LOCK()

[cgilite] / cgilite.sh

diff --git a/cgilite.sh b/cgilite.sh
index 79982884dfffffb91e83c6f8392c72e5becdaa1a..6821a7a662e6cf6630af51691ae3816ca10959e4 100755 (executable)
--- a/cgilite.sh
+++ b/cgilite.sh
@@ -50,7 +50,7 @@ HEX_DECODE(){
   ')"
 }
 
-if [ -z "$REQUEST_METHOD" -a -z "$SERVER_PROTOCOL" ]; then
+if [ -z "$REQUEST_METHOD" ]; then
   # no webserver variables means we are running via inetd / ncat
   # so use builtin web server
 
@@ -81,22 +81,15 @@ if [ -z "$REQUEST_METHOD" -a -z "$SERVER_PROTOCOL" ]; then
     # Without Content-Length header, connection will terminate after
     # script.
 
-    cgilite_status='200 OK'; cgilite_response=''; cgilite_cl='';
-    . "$0" |sed '1{s;^Status: ;HTTP/1.1 ;; t; s;^;HTTP/1.1 200 OK\r\n;;}' \
-    | while read -r l; do case $l in
+    cgilite_status='200 OK'; cgilite_response=''; cgilite_cl="Connection: close${CR}";
+    . "$0" | while read -r l; do case $l in
       Status:*) cgilite_status="${l#Status: }";;
-      Content-Length:*) cgilite_response="$cgilite_response${BR}$l"; cgilite_cl='x';;
-      $CR) if [ "$cgilite_cl" ]; then
-             printf '%s %s\r\n%s\n\r\n' \
-               'HTTP/1.1' "${cgilite_status%${CR}}" \
-               "$cgilite_response"
-             cat; exit 0
-           else
-             printf '%s %s\r\n%s\n%s\r\n\r\n' \
-               'HTTP/1.1' "${cgilite_status%${CR}}" \
-               "$cgilite_response" "Connection: close"
-             cat; exit 1
-           fi;;
+      Content-Length:*) cgilite_cl="${l}";;
+      $CR) printf '%s %s\r\n%s\n%s\n\r\n' \
+             'HTTP/1.1' "${cgilite_status%${CR}}" \
+             "$cgilite_response" "${cgilite_cl}"
+           cat
+           [ "${cgilite_cl#Connection}" = "${cgilite_cl}" ]; exit;;
       *) cgilite_response="$cgilite_response${BR}$l";;
     esac; done || exit 0;
     (sleep $cgilite_timeout && kill $$) & cgilite_watchdog=$!
@@ -180,6 +173,18 @@ URL(){
   | tr , %
 }
 
+PATH(){
+  printf %s "$1" \
+  | sed -r 's;^.*$;/&/;; s;/+;/;g;
+            :X;
+            s;^/../;/;; s;/./;/;g;
+            tX;
+            s;/[^/]+/../;/;;
+            tX;
+            s;^(/.*)/$;\1;'
+}
+
+
 SET_COOKIE(){
   case "$1" in
     ''|0|session) expire='';;
@@ -195,7 +200,7 @@ SET_COOKIE(){
 }
 
 REDIRECT(){
-  printf '%s: %s\r\n'
+  printf '%s: %s\r\n' \
     Status "303 See Other" \
     Content-Length 0 \
     Location "$*"