httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1507681 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/dav/main/mod_dav.c
Date Sat, 27 Jul 2013 16:16:01 GMT
Author: jim
Date: Sat Jul 27 16:16:01 2013
New Revision: 1507681

URL: http://svn.apache.org/r1507681
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1506714

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1507681&r1=1507680&r2=1507681&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Jul 27 16:16:01 2013
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c?rev=1507681&r1=1507680&r2=1507681&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c Sat Jul 27 16:16:01 2013
@@ -2756,7 +2756,7 @@ static int dav_method_copymove(request_r
      * 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_r
      */
     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,



Mime
View raw message