ASF Bugzilla – Attachment 32557 Details for
Bug 50773
Dav lock database corruption
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for httpd 2.5.x-dev r1665752
davlock.patch (text/plain), 1.62 KB, created by
Wim Lewis
on 2015-03-11 01:30:56 UTC
(
hide
)
Description:
Patch for httpd 2.5.x-dev r1665752
Filename:
MIME Type:
Creator:
Wim Lewis
Created:
2015-03-11 01:30:56 UTC
Size:
1.62 KB
patch
obsolete
>Index: modules/dav/fs/lock.c >=================================================================== >--- modules/dav/fs/lock.c (revision 1665752) >+++ modules/dav/fs/lock.c (working copy) >@@ -619,7 +619,8 @@ > ip->key.dptr = apr_pmemdup(p, val.dptr + offset, ip->key.dsize); > offset += ip->key.dsize; > >- if (!dav_fs_lock_expired(ip->timeout)) { >+ if (!dav_fs_lock_expired(ip->timeout) >+ && dav_dbm_exists(lockdb->info->db, ip->key)) { > ip->next = *indirect; > *indirect = ip; > } >@@ -1054,6 +1055,7 @@ > else { > /* DAV_GETLOCKS_PARTIAL */ > newlock->rectype = DAV_LOCKREC_INDIRECT_PARTIAL; >+ newlock->timeout = ip->timeout; > } > > /* hook into the result list */ >Index: modules/dav/lock/locks.c >=================================================================== >--- modules/dav/lock/locks.c (revision 1665752) >+++ modules/dav/lock/locks.c (working copy) >@@ -646,7 +646,8 @@ > ip->key.dptr = apr_pmemdup(p, val.dptr + offset, ip->key.dsize); > offset += ip->key.dsize; > >- if (!dav_generic_lock_expired(ip->timeout)) { >+ if (!dav_generic_lock_expired(ip->timeout) >+ && dav_dbm_exists(lockdb->info->db, ip->key)) { > ip->next = *indirect; > *indirect = ip; > } >@@ -847,6 +848,7 @@ > else { > /* DAV_GETLOCKS_PARTIAL */ > newlock->rectype = DAV_LOCKREC_INDIRECT_PARTIAL; >+ newlock->timeout = ip->timeout; > } > > /* hook into the result list */
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 50773
:
26653
|
30204
| 32557