Merge r1933353 from trunk:

mod_dav_lock: use the right dav_lock_discovery

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

diff --git a/modules/dav/lock/locks.c b/modules/dav/lock/locks.c
index 0f072ec0647bc0f5dec1d926d837b0e81e60fddd..d357e4572d13c27fb7ac90d6610fa9195e77b645 100644 (file)
--- a/modules/dav/lock/locks.c
+++ b/modules/dav/lock/locks.c
@@ -1190,13 +1190,13 @@ static dav_error * dav_generic_refresh_locks(dav_lockdb *lockdb,
         }
         if (dav_generic_do_refresh(dp_scan, ltl, new_time)) {
             /* the lock was refreshed. return the lock. */
-            newlock = dav_generic_alloc_lock(lockdb, ip->key, dp->locktoken);
+            newlock = dav_generic_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;