You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@apache.org on 2003/01/07 22:08:03 UTC
cvs commit: httpd-2.0/modules/dav/main util.c
gstein 2003/01/07 13:08:03
Modified: modules/dav/main util.c
Log:
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 <ma...@akuma.org>
Revision Changes Path
1.43 +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.43
diff -u -r1.42 -r1.43
--- util.c 29 Oct 2002 06:16:42 -0000 1.42
+++ util.c 7 Jan 2003 21:08:03 -0000 1.43
@@ -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) {