Author: remy.maucherat(a)jboss.com Date: 2012-10-02 08:04:41 -0400 (Tue, 02 Oct 2012) New Revision: 2094 Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/StandardHostValve.java branches/7.2.x/webapps/docs/changelog.xml Log: Port default error page (now clarified). Also port a minor additional patch. Modified: branches/7.2.x/src/main/java/org/apache/catalina/core/StandardHostValve.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/catalina/core/StandardHostValve.java 2012-10-01 16:46:15 UTC (rev 2093) +++ branches/7.2.x/src/main/java/org/apache/catalina/core/StandardHostValve.java 2012-10-02 12:04:41 UTC (rev 2094) @@ -419,6 +419,10 @@ return; ErrorPage errorPage = context.findErrorPage(statusCode); + if (errorPage == null) { + // Look for a default error page + errorPage = context.findErrorPage(0); + } if (errorPage != null) { response.setAppCommitted(false); request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE, @@ -509,6 +513,7 @@ // Reset the response (keeping the real error code and message) response.resetBuffer(true); + response.setContentLength(-1); // Forward control to the specified location ServletContext servletContext = Modified: branches/7.2.x/webapps/docs/changelog.xml =================================================================== --- branches/7.2.x/webapps/docs/changelog.xml 2012-10-01 16:46:15 UTC (rev 2093) +++ branches/7.2.x/webapps/docs/changelog.xml 2012-10-02 12:04:41 UTC (rev 2094) @@ -46,6 +46,9 @@ <fix> <bug>53801</bug>: Fix some edge case with overlapping security constraints. (markt) </fix> + <fix> + Add default error pages which got clarified. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote">