This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 942d4d7 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63597
942d4d7 is described below
commit 942d4d76784d902d71de94be9d8f4f2f991031de
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 24 16:26:38 2019 +0100
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63597
Update to take account of HTML escaping refactoring
---
webapps/docs/changelog.xml | 9 +++++++++
webapps/host-manager/WEB-INF/jsp/404.jsp | 4 ++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8416e8a..479390d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -99,6 +99,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ <bug>63597</bug>: Update the custom 404 error page for the Host Manager
+ to take account of previous refactoring so that the page is used for
+ 404 errors rather than falling back to the default error page. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
diff --git a/webapps/host-manager/WEB-INF/jsp/404.jsp
b/webapps/host-manager/WEB-INF/jsp/404.jsp
index 9816df5..1950b77 100644
--- a/webapps/host-manager/WEB-INF/jsp/404.jsp
+++ b/webapps/host-manager/WEB-INF/jsp/404.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ page import="org.apache.catalina.util.RequestUtil" session="false"
+<%@ page import="org.apache.tomcat.util.security.Escape" session="false"
trimDirectiveWhitespaces="true" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
<html>
@@ -33,7 +33,7 @@
<h1>404 Not found</h1>
<p>
The page you tried to access
- (<%=RequestUtil.filter((String) request.getAttribute(
+ (<%=Escape.htmlElementContent((String) request.getAttribute(
"javax.servlet.error.request_uri"))%>)
does not exist.
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
