Use a more reliable mechanism for the DefaultServlet when determining…

… if the current request is for custom error page or not. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk@1793469 13f79535-47bb-0310-9956-ffa450edef68
apache · May 2, 2017 · 3242efe · 3242efe
1 parent 111f752
commit 3242efe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -794,7 +794,7 @@ protected void serveResource(HttpServletRequest request,
             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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -78,6 +78,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">