From 443bdca08d0ff1dde3c5200fb38ab841a50cd808 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 4 Sep 2007 11:48:57 +0000 Subject: [PATCH] Merge r562503 from trunk: PR 42847. Reviewed by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@572632 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 9 --------- modules/generators/mod_info.c | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index b4b9de04962..47a2873565e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.6 + *) mod_info: mod_info outputs invalid XHTML 1.0 transitional. + PR 42847 [Rici Lake ] + *) mod_ssl: Fix spurious hostname mismatch warning for valid wildcard certificates. PR 37911. [Nick Burch ] diff --git a/STATUS b/STATUS index 21cbcd261f6..3edaca27985 100644 --- a/STATUS +++ b/STATUS @@ -80,15 +80,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_info: mod_info outputs invalid XHTML 1.0 Transitional. - PR 42847. - Trunk version of patch: - http://svn.apache.org/viewcvs.cgi?rev=562503&view=rev - Backport version for 2.2.x of patch: - Trunk version of patch works - +1: rpluem, fielding, jim - - PATCHES PROPOSED TO BACKPORT FROM TRUNK: * mod_authn_dbd: Export any additional columns queried in the SQL select diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c index 7386bb005f5..adc34150eee 100644 --- a/modules/generators/mod_info.c +++ b/modules/generators/mod_info.c @@ -721,7 +721,7 @@ static int display_info(request_rec * r) ap_escape_html(r->pool, cmd->name), cmd->name[0] == '<' ? ">" : ""); if (cmd->errmsg) { - ap_rputs(cmd->errmsg, r); + ap_rputs(ap_escape_html(r->pool, cmd->errmsg), r); } ap_rputs("\n", r); } -- 2.47.2