You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2021/01/13 20:32:19 UTC

svn commit: r1885448 - in /jackrabbit/branches/2.20: ./ jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java

Author: reschke
Date: Wed Jan 13 20:32:19 2021
New Revision: 1885448

URL: http://svn.apache.org/viewvc?rev=1885448&view=rev
Log:
JCR-4663: webdav: check Content-Range on PUT (merged r1885238 into 2.20)

Added:
    jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java
      - copied unchanged from r1885238, jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/PutTest.java
Modified:
    jackrabbit/branches/2.20/   (props changed)
    jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java

Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1885238

Modified: jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java?rev=1885448&r1=1885447&r2=1885448&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java Wed Jan 13 20:32:19 2021
@@ -690,6 +690,11 @@ abstract public class AbstractWebdavServ
     protected void doPut(WebdavRequest request, WebdavResponse response,
                          DavResource resource) throws IOException, DavException {
 
+        if (request.getHeader("Content-Range") != null) {
+            response.sendError(DavServletResponse.SC_BAD_REQUEST, "Content-Range in PUT request not supported");
+            return;
+        }
+
         DavResource parentResource = resource.getCollection();
         if (parentResource == null || !parentResource.exists()) {
             // parent does not exist