Merge branch '2.9dev' into debug_output_in_html

This commit is contained in:
David Cooper 2017-04-13 16:34:44 -04:00
commit 27124a404b

View File

@ -1875,6 +1875,7 @@ emphasize_stuff_in_headers(){
-e "s/X-AspNet-Version/${yellow}X-AspNet-Version${off}/g"
if "$do_html"; then
if [[ $COLOR -eq 2 ]]; then
html_out "$(tm_out "$1" | sed -e 's/\&/\&/g' \
-e 's/</\&lt;/g' -e 's/>/\&gt;/g' -e 's/"/\&quot;/g' -e "s/'/\&apos;/g" \
-e "s/\([0-9]\)/${html_brown}\1${html_off}/g" \
@ -1906,6 +1907,9 @@ emphasize_stuff_in_headers(){
-e "s/X-Powered-By/${html_yellow}X-Powered-By${html_off}/g" \
-e "s/X-UA-Compatible/${html_yellow}X-UA-Compatible${html_off}/g" \
-e "s/X-AspNet-Version/${html_yellow}X-AspNet-Version${html_off}/g")"
else
html_out "$(html_reserved "$1")"
fi
html_out "\n"
fi
}