Ensure that when the Default or WebDAV servlets process an error disp…

…atch that the error resource is processed via the doGet() method irrespective of the method used for the original request that triggered the error. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1793491 13f79535-47bb-0310-9956-ffa450edef68
apache · May 2, 2017 · 58b3204 · 58b3204
1 parent 3bfe9fb
commit 58b3204
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -423,6 +423,18 @@ protected String getPathPrefix(final HttpServletRequest request) {
     }
 
 
+    @Override
+    protected void service(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+
+        if (req.getDispatcherType() == DispatcherType.ERROR) {
+            doGet(req, resp);
+        } else {
+            super.service(req, resp);
+        }
+    }
+
+
     /**
      * Process a GET request for the specified resource.
      *

diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -40,6 +40,7 @@
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -354,6 +355,11 @@ protected void service(HttpServletRequest req, HttpServletResponse resp)
             return;
         }
 
+        if (req.getDispatcherType() == DispatcherType.ERROR) {
+            doGet(req, resp);
+            return;
+        }
+
         final String method = req.getMethod();
 
         if (debug > 0) {

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -140,6 +140,12 @@
         <bug>60911</bug>: Ensure NPE will not be thrown when looking for SSL
         session ID. Based on a patch by Didier Gutacker. (violetagg)
       </fix>
+      <fix>
+        Ensure that when the Default or WebDAV servlets process an error
+        dispatch that the error resource is processed via the
+        <code>doGet()</code> method irrespective of the method used for the
+        original request that triggered the error. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">