X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=cgilite.sh;h=6821a7a662e6cf6630af51691ae3816ca10959e4;hp=3292e031a81c6672baa47f569108f17caaf6e101;hb=40c5373a1f5eb710635f340e88c31f8c9dfedfeb;hpb=d40a35427289228d1067f2c9c23551a5fd6da6fc

diff --git a/cgilite.sh b/cgilite.sh
index 3292e03..6821a7a 100755
--- 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
 
@@ -82,15 +82,14 @@ if [ -z "$REQUEST_METHOD" -a -z "$SERVER_PROTOCOL" ]; then
     # script.
 
     cgilite_status='200 OK'; cgilite_response=''; cgilite_cl="Connection: close${CR}";
-    . "$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
+    . "$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' \
              'HTTP/1.1' "${cgilite_status%${CR}}" \
-             "$cgilite_response" "${cgilite_cl}" |tee /dev/stderr
-           cat;
-           [ "${cgilite_cl#Connection}" = "${cgilite_cl}" ] && exit 0 || exit 1;;
+             "$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=$!
@@ -174,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='';;
@@ -189,7 +200,7 @@ SET_COOKIE(){
 }
 
 REDIRECT(){
-  printf '%s: %s\r\n'
+  printf '%s: %s\r\n' \
     Status "303 See Other" \
     Content-Length 0 \
     Location "$*"