From: Greg Stein Date: Tue, 7 Jan 2003 21:08:03 +0000 (+0000) Subject: When unlocking, the auto-checkin code does not need to refer to the X-Git-Tag: pre_ajp_proxy~2317 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60c41ddef3cf3e058dc70824cb859a199c43acff;p=apache When unlocking, the auto-checkin code does not need to refer to the parent resource. We want to (possibly) check in only the resource identified by the params. Bug found by David Waite git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98187 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/dav/main/util.c b/modules/dav/main/util.c index 5ca232c13f..1772982788 100644 --- a/modules/dav/main/util.c +++ b/modules/dav/main/util.c @@ -2019,14 +2019,14 @@ dav_error *dav_auto_checkin( /* If parent resource was checked out, and auto-checkin is enabled, * then check it in. */ - if (av_info->parent_resource != NULL && av_info->parent_resource->working - && (unlock || av_info->parent_checkedout)) { + if (!unlock + && av_info->parent_checkedout + && av_info->parent_resource != NULL + && av_info->parent_resource->working) { auto_version = (*vsn_hooks->auto_versionable)(av_info->parent_resource); - if (auto_version == DAV_AUTO_VERSION_ALWAYS || - (unlock && (auto_version == DAV_AUTO_VERSION_LOCKED))) { - + if (auto_version == DAV_AUTO_VERSION_ALWAYS) { if ((err = (*vsn_hooks->checkin)(av_info->parent_resource, 0 /*keep_checked_out*/, NULL)) != NULL) {