From: Jim Jagielski <jim@apache.org>
Date: Sat, 27 Jul 2013 16:16:01 +0000 (+0000)
Subject: Merge r1506714 from trunk:
X-Git-Tag: 2.4.7~338
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0af7cec9423a5c654490a23c22584f64ccda2a98;p=apache

Merge r1506714 from trunk:

Fix bug #55304 with the provided patch, slightly reformatted.

In short: do not validate conditions of a COPY source's parent since
it is not modified during the operation.

* modules/dav/main/mod_dav.c:
  (dav_method_copymove): adjust params to dav_validate_request()

Submitted by: gstein
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1507681 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 0f008fdb48..7e0f9c52f5 100644
--- a/STATUS
+++ b/STATUS
@@ -100,9 +100,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                  http://people.apache.org/~covener/patches/2.4.x-cache_err.diff
     +1: covener (I reset the votes due to the # of conflicts in the trunk revs), jailletc36, trawick
 
-  * mod_dav: Teeny patch to fix #55304
-    trunk: http://svn.apache.org/r1506714
-    +1: gstein, wrowe, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 9135cd9606..1c2cbb17ce 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -2756,7 +2756,7 @@ static int dav_method_copymove(request_rec *r, int is_move)
      * The multistatus responses will contain the information about any
      * resource that fails the validation.
      *
-     * We check the parent resource, too, since this is a MOVE. Moving the
+     * We check the parent resource, too, if this is a MOVE. Moving the
      * resource effectively removes it from the parent collection, so we
      * must ensure that we have met the appropriate conditions.
      *
@@ -2765,7 +2765,8 @@ static int dav_method_copymove(request_rec *r, int is_move)
      */
     if ((err = dav_validate_request(r, resource, depth, NULL,
                                     &multi_response,
-                                    DAV_VALIDATE_PARENT
+                                    (is_move ? DAV_VALIDATE_PARENT
+                                             : DAV_VALIDATE_RESOURCE)
                                     | DAV_VALIDATE_USE_424,
                                     NULL)) != NULL) {
         err = dav_push_error(r->pool, err->status, 0,