Author: kkolinko
Date: Fri Jun 6 16:24:32 2014
New Revision: 1600955
URL: http://svn.apache.org/r1600955
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56600
Fix missing "return;" statements after sendError():
do not waste time generating response for PROPFIND requests that contain broken
XML document.
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/webapps/docs/changelog.xml
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=1600955&r1=1600954&r2=1600955&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Fri Jun
6 16:24:32 2014
@@ -521,9 +521,11 @@ public class WebdavServlet
} catch (SAXException e) {
// Something went wrong - bad request
resp.sendError(WebdavStatus.SC_BAD_REQUEST);
+ return;
} catch (IOException e) {
// Something went wrong - bad request
resp.sendError(WebdavStatus.SC_BAD_REQUEST);
+ return;
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1600955&r1=1600954&r2=1600955&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jun 6 16:24:32 2014
@@ -126,6 +126,10 @@
and TLD defined listeners are added via a different code path that
already enforces the specification requirements. (markt)
</fix>
+ <fix>
+ <bug>56600</bug>: In WebdavServlet: Do not waste time generating
+ response for broken PROPFIND requests. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
