Merge commit '178c015a44368ed1aa2e400ddc5f52c84944b196'

diff --combined cgilite/cgilite.sh
index a2aa32924bdc7ed30cc35fb053b416859a05f93c,526a0fc738410dcfafa31017a836cc5ad7a71a03..526a0fc738410dcfafa31017a836cc5ad7a71a03
--- 1/cgilite/cgilite.sh
--- 2/cgilite.sh
+++ b/cgilite/cgilite.sh
@@@ -48,7 -48,7 +48,7 @@@ _EXEC="${_EXEC:-${0%/*}}
  _DATA="${_DATA:-.}"
  _EXEC="${_EXEC%/}" _DATA="${_DATA%/}" _BASE="${_BASE%/}"
  
- # Carriare Return and Line Break characters for convenience
+ # Carriage Return and Line Break characters for convenience
  CR="\r"
  BR='
  '
@@@ -90,7 -90,7 +90,7 @@@ HEX_DECODE()
          *) out="${out}${in%"${in#?}"}"; in="${in#?}"; continue;;
      esac;
  
-     # Hex escaes for printf (e.g. \x41) are not portable 
+     # Hex escapes for printf (e.g. \x41) are not portable 
      # The portable way for Hex output is transforming Hex to Octal
      # (e.g. \x41 = \101)
      case $in in
@@@ -146,6 -146,7 +146,7 @@@ if [ -z "$REQUEST_METHOD" ]; the
  
      SERVER_PROTOCOL="${SERVER_PROTOCOL%${CR}}"
      PATH_INFO="$(HEX_DECODE % "${REQUEST_URI%\?*}" |PATH)"
+     PATH_INFO="$(PATH "/${PATH_INFO#${_BASE}}")"
      [ "${REQUEST_URI}" = "${REQUEST_URI#*\?}" ] \
      && QUERY_STRING='' \
      || QUERY_STRING="${REQUEST_URI#*\?}"

diff --combined cgilite/users.sh
index c13703b418fc057adcdc936d26b515c55a3a74f7,eaf4c272a721b87642f338f3d888155fea9fd47d..eaf4c272a721b87642f338f3d888155fea9fd47d
--- 1/cgilite/users.sh
--- 2/users.sh
+++ b/cgilite/users.sh
@@@ -151,7 -151,7 +151,7 @@@ user_register()
        RELEASE "$user_db"
  
        debug "Sending Activation Link:" \
-             "https://${HTTP_HOST%:*}/${_BASE}${PATH_INFO}?user_confirm=${uid}+$(session_mac "$uid")"
+             "https://${HTTP_HOST}${_BASE}${PATH_INFO}?user_confirm=${uid}+$(session_mac "$uid")"
        sendmail -t -f "$MAILFROM" <<-EOF
        From: ${MAILFROM}
        To: ${email}
@@@ -161,7 -161,7 +161,7 @@@
  
        You can activate your account using this link:
  
-           https://${HTTP_HOST%:*}/${_BASE}${PATH_INFO}?user_confirm=${uid}+$(session_mac "$uid")
+           https://${HTTP_HOST}${_BASE}${PATH_INFO}?user_confirm=${uid}+$(session_mac "$uid")
  
        This registration link will expire after 24 hours.
  
@@@ -220,7 -220,7 +220,7 @@@ user_invite()
             >>"$user_db"
      RELEASE "$user_db"
      debug "Sending Invitation Link:" \
-           "https://${HTTP_HOST%:*}/${_BASE}${PATH_INFO}?user_confirm=${uid}+$(session_mac "$uid")"
+           "https://${HTTP_HOST}${BASE}${PATH_INFO}?user_confirm=${uid}+$(session_mac "$uid")"
      sendmail -t -f "$MAILFROM" <<-EOF
        From: ${MAILFROM}
        To: ${email}
@@@ -232,7 -232,7 +232,7 @@@
  
        You can create your account using this link:
  
-           https://${HTTP_HOST%:*}/${_BASE}${PATH_INFO}?user_confirm=${uid}+$(session_mac "$uid")
+           https://${HTTP_HOST}${_BASE}${PATH_INFO}?user_confirm=${uid}+$(session_mac "$uid")
  
        This registration link will expire after 24 hours.