mod_dav: Sending an If or If-Match header with an invalid ETag doesn't

result in a 412 Precondition Failed for a COPY operation.  PR54610

trunk patch: http://svn.apache.org/r1476604
Submitted by: Timothy Wood <tjw omnigroup.com>
Reviewed by: minfrin, jim, jorton

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

diff --git a/CHANGES b/CHANGES
index bda41f308e6b74862ab1cf0340b42216900a1e8d..d24a171a02bffbee72702f12fac9eb6d85540d70 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.5
 
+  *) mod_dav: Sending a If or If-Match header with an invalid ETag doesn't
+     result in a 412 Precondition Failed. PR54610 [Timothy Wood
+     <tjw omnigroup.com>]
+
   *) mod_dav: Make sure that when we prepare an If URL for Etag comparison,
      we compare unencoded paths. PR 53910 [Timothy Wood <tjw omnigroup.com>]
 

diff --git a/STATUS b/STATUS
index 8a434bd08f22d8c32f91424e900bf023f66f2736..07dfcd20223389db045775fbbf4ba72ac29d30cc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,12 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
   
-    * mod_dav: Sending a If or If-Match header with an invalid ETag doesn't
-      result in a 412 Precondition Failed. PR54610
-      trunk patch: http://svn.apache.org/r1476604
-      2.4.x patch: trunk patch works (minus CHANGES)
-      +1: minfrin, jim, jorton
-
     * mod_dav: When a PROPPATCH attempts to remove a non-existent dead
       property on a resource for which there is no dead property in the same
       namespace httpd segfaults. PR 52559

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 2c323f48f857704991cee17d12a7354119ec4925..05b4669eab952223b89d085c366ef09ace932bfb 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -2751,10 +2751,10 @@ static int dav_method_copymove(request_rec *r, int is_move)
     }
 
     /*
-     * Check If-Headers and existing locks for each resource in the source
-     * if we are performing a MOVE. We will return a 424 response with a
-     * DAV:multistatus body. The multistatus responses will contain the
-     * information about any resource that fails the validation.
+     * Check If-Headers and existing locks for each resource in the source.
+     * We will return a 424 response with a DAV:multistatus body.
+     * 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
      * resource effectively removes it from the parent collection, so we
@@ -2763,17 +2763,17 @@ static int dav_method_copymove(request_rec *r, int is_move)
      * If a problem occurs with the Request-URI itself, then a plain error
      * (rather than a multistatus) will be returned.
      */
-    if (is_move
-        && (err = dav_validate_request(r, resource, depth, NULL,
-                                       &multi_response,
-                                       DAV_VALIDATE_PARENT
-                                       | DAV_VALIDATE_USE_424,
-                                       NULL)) != NULL) {
+    if ((err = dav_validate_request(r, resource, depth, NULL,
+                                    &multi_response,
+                                    DAV_VALIDATE_PARENT
+                                    | DAV_VALIDATE_USE_424,
+                                    NULL)) != NULL) {
         err = dav_push_error(r->pool, err->status, 0,
                              apr_psprintf(r->pool,
-                                          "Could not MOVE %s due to a failed "
+                                          "Could not %s %s due to a failed "
                                           "precondition on the source "
                                           "(e.g. locks).",
+                                          is_move ? "MOVE" : "COPY",
                                           ap_escape_html(r->pool, r->uri)),
                              err);
         return dav_handle_err(r, err, multi_response);