Merge commit 'c0c355eff97c4b2e3e6d5f61d71b5cdf8d67a785'

[serve0] / cgilite / cgilite.sh

diff --git a/cgilite/cgilite.sh b/cgilite/cgilite.sh
index b47a3e2e683219b773af4383059a6701f2d44d46..b51ee8ec9e4c938413817bd8dff00ffdb3ab1d82 100755 (executable)
--- a/cgilite/cgilite.sh
+++ b/cgilite/cgilite.sh
@@ -264,7 +264,7 @@ HEADER(){
     str="${str#*${BR}${1}: }"
     printf %s "${str%%${BR}*}"
   else
-    local var="HTTP_$(printf %s "$1" |tr a-z- A-Z-)"
+    local var="HTTP_$(printf %s "$1" |tr a-z- A-Z_)"
     eval "[ \"\$$var\" ] && printf %s \"\$$var\" || return 1"
     # eval "printf %s \"\$HTTP_$(printf %s "${1}" |tr a-z A-Z |tr -c A-Z _)\""
   fi
@@ -294,7 +294,7 @@ HTML(){
     \]*) out="${out}]";      str="${str#?}";;
     "${CR}"*) out="${out}
"; str="${str#?}";;
     "${BR}"*) out="${out}
"; str="${str#?}";;
-    *) out="${out}${str%%[]&<>\"\'[]*}"; str="${str#"${str%%[]&<>\"\'[]*}"}";;
+    *) out="${out}${str%%[]&<>\"\'${CR}${BR}[]*}"; str="${str#"${str%%[]&<>\"\'${CR}${BR}[]*}"}";;
   esac; done
   printf %s "$out"
 }