Author: remm
Date: Mon Jan 29 15:49:14 2018
New Revision: 1822524
URL: http://svn.apache.org/viewvc?rev=1822524&view=rev
Log:
62049: Fix missing escape util class from custom 404 error page.
Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/manager/WEB-INF/jsp/404.jsp
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1822524&r1=1822523&r2=1822524&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 29 15:49:14 2018
@@ -99,7 +99,7 @@
<bug>62032</bug>: Fix NullPointerException when certificateFile is not
defined on an SSLHostConfig and unify the behavior when a
certificateFile is defined but the file does not exist for both
- JKS and PEM file types.
+ JKS and PEM file types. (csutherl)
</fix>
<fix>
Ensure that the <code>toString()</code> method behaves consistently for
@@ -135,6 +135,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Webapps">
+ <changelog>
+ <fix>
+ <bug>62049</bug>: Fix missing class from manager 404 JSP error page.
+ (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.4 (markt)" rtext="2018-01-22">
<subsection name="Catalina">
Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/404.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/404.jsp?rev=1822524&r1=1822523&r2=1822524&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/jsp/404.jsp (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/jsp/404.jsp Mon Jan 29 15:49:14 2018
@@ -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: [email protected]
For additional commands, e-mail: [email protected]
