Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 36632 invoked by uid 500); 7 Jan 2003 21:09:53 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 36620 invoked by uid 500); 7 Jan 2003 21:09:53 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 7 Jan 2003 21:09:53 -0000 Message-ID: <20030107210953.34393.qmail@icarus.apache.org> From: gstein@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/dav/main util.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N gstein 2003/01/07 13:09:53 Modified: modules/dav/main Tag: APACHE_2_0_BRANCH util.c Log: [ backport from HEAD (rev 1.43) ] 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 Revision Changes Path No revision No revision 1.42.2.1 +5 -5 httpd-2.0/modules/dav/main/util.c Index: util.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/dav/main/util.c,v retrieving revision 1.42 retrieving revision 1.42.2.1 diff -u -r1.42 -r1.42.2.1 --- util.c 29 Oct 2002 06:16:42 -0000 1.42 +++ util.c 7 Jan 2003 21:09:53 -0000 1.42.2.1 @@ -2019,14 +2019,14 @@ /* 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) {