Merge commit '4814ae28928f948f44bdf0b8823226120a442dfb'

diff --combined cgilite/cgilite.sh
index 03541b41829355d69287596ed40041dccf8545e1,90d65577648d2d78efa7d349e90677984f87c436..90d65577648d2d78efa7d349e90677984f87c436
--- 1/cgilite/cgilite.sh
--- 2/cgilite.sh
+++ b/cgilite/cgilite.sh
@@@ -313,7 -313,7 +313,7 @@@ URL()
      "${CR}"*) out="${out}%0D"; str="${str#?}";;
      "${BR}"*) out="${out}%0A"; str="${str#?}";;
      %*) out="${out}%25"; str="${str#?}";;
-     *) out="${out}${str%%[]&\"\'#     ${CR}${BR}[]*}"; str="${str#"${str%%[]&\"\'#    ${CR}${BR}[]*}"}";;
+     *) out="${out}${str%%[]&\"\'\?#   ${CR}${BR}%[]*}"; str="${str#"${str%%[]&\"\'\?#         ${CR}${BR}%[]*}"}";;
    esac; done
    printf %s "$out"
  }