Author: kkolinko
Date: Wed Jun 11 17:35:36 2014
New Revision: 1601968
URL: http://svn.apache.org/r1601968
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.
Merged r1600956 from tomcat/tc7.0.x/trunk.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1600955
Merged /tomcat/tc7.0.x/trunk:r1600956
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1601968&r1=1601967&r2=1601968&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 11 17:35:36 2014
@@ -36,12 +36,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko, schultz
-1:
-* http://issues.apache.org/bugzilla/show_bug.cgi?id=56600
- In WebdavServlet: Do not waste time generating response for broken PROPFIND
request.
- http://svn.apache.org/r1600956
- +1: kkolinko, markt, schultz
- -1:
-
* Improvements to ChunkedInputFilter
- Clean-up
- i18n for ChunkedInputFilter error message
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1601968&r1=1601967&r2=1601968&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Wed Jun 11 17:35:36 2014
@@ -555,9 +555,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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1601968&r1=1601967&r2=1601968&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jun 11 17:35:36 2014
@@ -44,6 +44,14 @@
General, Catalina, Coyote, Jasper, Cluster, Web applications, Other
-->
<section name="Tomcat 6.0.42 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>56600</bug>: In WebdavServlet: Do not waste time generating
+ response for broken PROPFIND request. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
