Author: remy.maucherat(a)jboss.com Date: 2009-04-02 12:47:16 -0400 (Thu, 02 Apr 2009) New Revision: 980 Modified: trunk/java/org/apache/catalina/servlets/WebdavServlet.java trunk/webapps/docs/changelog.xml Log: - Port patch. Modified: trunk/java/org/apache/catalina/servlets/WebdavServlet.java =================================================================== --- trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2009-04-02 16:17:25 UTC (rev 979) +++ trunk/java/org/apache/catalina/servlets/WebdavServlet.java 2009-04-02 16:47:16 UTC (rev 980) @@ -734,7 +734,7 @@ return; } - if (req.getInputStream().available() > 0) { + if (req.getContentLength() > 0) { DocumentBuilder documentBuilder = getDocumentBuilder(); try { // Document document = @@ -745,7 +745,7 @@ } catch(SAXException saxe) { // Parse error - assume invalid content - resp.sendError(WebdavStatus.SC_BAD_REQUEST); + resp.sendError(WebdavStatus.SC_UNSUPPORTED_MEDIA_TYPE); return; } } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2009-04-02 16:17:25 UTC (rev 979) +++ trunk/webapps/docs/changelog.xml 2009-04-02 16:47:16 UTC (rev 980) @@ -47,6 +47,9 @@ <update> Move InstanceManager and PeriodicEventListener to org.apache.tomcat. (markt) </update> + <fix> + Wrong MKCOL status code for errors. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote">