httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/dav/main mod_dav.c
Date Mon, 17 Jul 2000 05:17:05 GMT
keith       00/07/16 22:17:05

  Modified:    src/modules/dav/main mod_dav.c
  Log:
  Fix copy/move depth infinity lock propagation problem.
  Submitted by: Joe Orton <joe@orton.demon.co.uk>
  
  Revision  Changes    Path
  1.14      +3 -1      apache-2.0/src/modules/dav/main/mod_dav.c
  
  Index: mod_dav.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/main/mod_dav.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_dav.c	2000/07/11 00:06:22	1.13
  +++ mod_dav.c	2000/07/17 05:17:02	1.14
  @@ -2060,6 +2060,7 @@
       int replaced;
       int src_parent_was_writable = 0;
       int dst_parent_was_writable = 0;
  +    int resource_state;
   
       /* Ask repository module to resolve the resource */
       result = dav_get_resource(r, &resource);
  @@ -2329,6 +2330,8 @@
       /* New resource will be same kind as source */
       resnew->collection = resource->collection;
   
  +    resource_state = dav_get_resource_state(lookup.rnew, resnew);
  +
       /* If target exists, remove it first (we know Ovewrite must be TRUE).
        * Then try to copy/move the resource.
        */
  @@ -2392,7 +2395,6 @@
   
       /* propagate any indirect locks at the target */
       if (lockdb != NULL) {
  -	int resource_state = dav_get_resource_state(lookup.rnew, resnew);
   
   	/* notify lock system that we have created/replaced a resource */
   	err = dav_notify_created(r, lockdb, resnew, resource_state, depth);
  
  
  

Mime
View raw message