You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/05/02 13:14:01 UTC
svn commit: r1793487 - in /tomcat/trunk:
java/org/apache/catalina/servlets/DefaultServlet.java
java/org/apache/catalina/servlets/WebdavServlet.java
webapps/docs/changelog.xml
Author: markt
Date: Tue May 2 13:14:00 2017
New Revision: 1793487
URL: http://svn.apache.org/viewvc?rev=1793487&view=rev
Log:
Ensure that when the Default or WebDAV servlets process an error dispatch that the error resource is processed via the doGet() method irrespective of the method used for the original request that triggered the error.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.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=1793487&r1=1793486&r2=1793487&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue May 2 13:14:00 2017
@@ -400,6 +400,18 @@ public class DefaultServlet extends Http
}
+ @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.
*
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1793487&r1=1793486&r2=1793487&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Tue May 2 13:14:00 2017
@@ -30,6 +30,7 @@ import java.util.Stack;
import java.util.TimeZone;
import java.util.Vector;
+import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -315,6 +316,11 @@ public class WebdavServlet
return;
}
+ if (req.getDispatcherType() == DispatcherType.ERROR) {
+ doGet(req, resp);
+ return;
+ }
+
final String method = req.getMethod();
if (debug > 0) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793487&r1=1793486&r2=1793487&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue May 2 13:14:00 2017
@@ -88,6 +88,12 @@
determining if the current request is for custom error page or not.
(markt)
</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">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org