View | Details | Raw Unified | Return to bug 50773
Collapse All | Expand All

(-)modules/dav/fs/lock.c (-1 / +3 lines)
Lines 619-625 Link Here
619
            ip->key.dptr = apr_pmemdup(p, val.dptr + offset, ip->key.dsize);
619
            ip->key.dptr = apr_pmemdup(p, val.dptr + offset, ip->key.dsize);
620
            offset += ip->key.dsize;
620
            offset += ip->key.dsize;
621
621
622
            if (!dav_fs_lock_expired(ip->timeout)) {
622
            if (!dav_fs_lock_expired(ip->timeout)
623
                && dav_dbm_exists(lockdb->info->db, ip->key)) {
623
                ip->next = *indirect;
624
                ip->next = *indirect;
624
                *indirect = ip;
625
                *indirect = ip;
625
            }
626
            }
Lines 1054-1059 Link Here
1054
        else {
1055
        else {
1055
            /* DAV_GETLOCKS_PARTIAL */
1056
            /* DAV_GETLOCKS_PARTIAL */
1056
            newlock->rectype = DAV_LOCKREC_INDIRECT_PARTIAL;
1057
            newlock->rectype = DAV_LOCKREC_INDIRECT_PARTIAL;
1058
            newlock->timeout = ip->timeout;
1057
        }
1059
        }
1058
1060
1059
        /* hook into the result list */
1061
        /* hook into the result list */
(-)modules/dav/lock/locks.c (-1 / +3 lines)
Lines 646-652 Link Here
646
            ip->key.dptr = apr_pmemdup(p, val.dptr + offset, ip->key.dsize);
646
            ip->key.dptr = apr_pmemdup(p, val.dptr + offset, ip->key.dsize);
647
            offset += ip->key.dsize;
647
            offset += ip->key.dsize;
648
648
649
            if (!dav_generic_lock_expired(ip->timeout)) {
649
            if (!dav_generic_lock_expired(ip->timeout)
650
                    && dav_dbm_exists(lockdb->info->db, ip->key)) {
650
                ip->next = *indirect;
651
                ip->next = *indirect;
651
                *indirect = ip;
652
                *indirect = ip;
652
            }
653
            }
Lines 847-852 Link Here
847
        else {
848
        else {
848
            /* DAV_GETLOCKS_PARTIAL */
849
            /* DAV_GETLOCKS_PARTIAL */
849
            newlock->rectype = DAV_LOCKREC_INDIRECT_PARTIAL;
850
            newlock->rectype = DAV_LOCKREC_INDIRECT_PARTIAL;
851
            newlock->timeout = ip->timeout;
850
        }
852
        }
851
853
852
        /* hook into the result list */
854
        /* hook into the result list */

Return to bug 50773