X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=cgilite.sh;h=9420b46c18ce96672ac10a9281ac9bd6806e9151;hp=f227d27fe47f65832bf9aefbec77dbcb4e262612;hb=a301c53cc6f28dde4fa2f80d5785f7988542e327;hpb=eadd19bbf26273a47f1ec3561f67db4a0f6bd12b

diff --git a/cgilite.sh b/cgilite.sh
index f227d27..9420b46 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
 
@@ -170,10 +170,23 @@ URL(){
 
   printf %s "$*" \
   | hexdump -v -e '/1 ",%02X"' \
-  | tr , %
+  | sed 's;,;%;g; s;%2F;/;g;'
 }
 
+PATH(){
+  printf %s "$1" \
+  | sed -r 's;^.*$;/&/;; s;/+;/;g;
+            :X;
+            s;^/\.\./;/;; s;/\./;/;g;
+            tX;
+            s;/[^/]+/\.\./;/;;
+            tX;
+            s;^(/.*)/$;\1;'
+}
+
+
 SET_COOKIE(){
+  local expire cookie
   case "$1" in
     ''|0|session) expire='';;
     [+-][0-9]*)   expire="$(date -R -d @$(($(date +%s) + $1)))";;
@@ -188,7 +201,7 @@ SET_COOKIE(){
 }
 
 REDIRECT(){
-  printf '%s: %s\r\n'
+  printf '%s: %s\r\n' \
     Status "303 See Other" \
     Content-Length 0 \
     Location "$*"