Commit a4501d34 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1677462 from trunk: 

mod_dav: Avoid doing the walk on a COPY source for handling preconditions if
there are no preconditions provided.

* modules/dav/main/util.c:
  (dav_validate_request): avoid validating locks and ETags when there are
    no If headers providing them on a resource we aren't modifying.

Submitted by: breser
Reviewed/backported by: jim


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

STATUS

+0 −9
Changes for STATUS: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -105,15 +105,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * mod_dav: Avoid some work that is unnecessary and often very time consuming.

     This helps mitigate Subversion issue #4531:

     http://subversion.tigris.org/issues/show_bug.cgi?id=4531

     SVN has their own workaround for this going out that helps more but is a bit

     of a hack.  This is as far as we can go without violating DAV in httpd.

     trunk patch: http://svn.apache.org/r1677462

     2.4.x patch: trunk works (modulo CHANGES)

     +1: breser, trawick, ylavic



  *) mod_authz_core: Allow "Require expr" to work when the expression is quoted,

     as in an example in the doc.  PR 56235

     trunk patch: http://svn.apache.org/r1585609

modules/dav/main/util.c

+4 −2
Changes for modules/dav/main/util.c: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1595,8 +1595,10 @@ DAV_DECLARE(dav_error *) dav_validate_request(request_rec *r, 
        }

    }



    /* (1) Validate the specified resource, at the specified depth */

    if (resource->exists && depth > 0) {

    /* (1) Validate the specified resource, at the specified depth.

     * Avoid the walk there is no if_header and we aren't planning

     * to modify this resource. */

    if (resource->exists && depth > 0 && !(!if_header && flags & DAV_VALIDATE_NO_MODIFY)) {

        dav_walker_ctx ctx = { { 0 } };

        dav_response *multi_status;