httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/dav/fs lock.c
Date Sun, 12 Sep 2004 22:24:05 GMT
jorton      2004/09/12 15:24:05

  Modified:    modules/dav/fs lock.c
  Log:
  * modules/dav/fs/lock.c (dav_fs_refresh_locks): Fix SEGV on refresh of
  indirect lock.
  
  PR: 31183
  
  Revision  Changes    Path
  1.33      +6 -6      httpd-2.0/modules/dav/fs/lock.c
  
  Index: lock.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/fs/lock.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -d -w -u -r1.32 -r1.33
  --- lock.c	12 Sep 2004 22:14:57 -0000	1.32
  +++ lock.c	12 Sep 2004 22:24:05 -0000	1.33
  @@ -1469,13 +1469,13 @@
   	}
   	if (dav_fs_do_refresh(dp_scan, ltl, new_time)) {
   	    /* the lock was refreshed. return the lock. */
  -	    newlock = dav_fs_alloc_lock(lockdb, ip->key, dp->locktoken);
  +	    newlock = dav_fs_alloc_lock(lockdb, ip->key, dp_scan->locktoken);
   	    newlock->is_locknull = !resource->exists;
  -	    newlock->scope = dp->f.scope;
  -	    newlock->type = dp->f.type;
  -	    newlock->depth = dp->f.depth;
  -	    newlock->timeout = dp->f.timeout;
  -	    newlock->owner = dp->owner;
  +	    newlock->scope = dp_scan->f.scope;
  +	    newlock->type = dp_scan->f.type;
  +	    newlock->depth = dp_scan->f.depth;
  +	    newlock->timeout = dp_scan->f.timeout;
  +	    newlock->owner = dp_scan->owner;
               newlock->auth_user = dp_scan->auth_user;
   
   	    newlock->next = *locks;
  
  
  

Mime
View raw message