Author: markt
Date: Tue May 2 11:20:32 2017
New Revision: 1793468
URL: http://svn.apache.org/viewvc?rev=1793468&view=rev
Log:
Use a more reliable mechanism for the DefaultServlet when determining if the
current request is for custom error page or not.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1793468&r1=1793467&r2=1793468&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue May
2 11:20:32 2017
@@ -787,7 +787,7 @@ public class DefaultServlet extends Http
return;
}
- boolean isError = response.getStatus() >=
HttpServletResponse.SC_BAD_REQUEST;
+ boolean isError = DispatcherType.ERROR == request.getDispatcherType();
boolean included = false;
// Check if the conditions specified in the optional If headers are
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793468&r1=1793467&r2=1793468&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 2 11:20:32 2017
@@ -83,6 +83,11 @@
the number of places the associated <code>Charset</code> needs to be
looked up. (markt)
</scode>
+ <fix>
+ Use a more reliable mechanism for the <code>DefaultServlet</code> when
+ determining if the current request is for custom error page or not.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
