Merge /trunk/subversion/mod_dav_svn changes r4132:4243 into autoversion branch.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/autoversion@844318 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/mod_dav_svn/activity.c b/subversion/mod_dav_svn/activity.c
index b5f3148..b9d4909 100644
--- a/subversion/mod_dav_svn/activity.c
+++ b/subversion/mod_dav_svn/activity.c
@@ -2,7 +2,7 @@
* activity.c: DeltaV activity handling
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/subversion/mod_dav_svn/dav_svn.h b/subversion/mod_dav_svn/dav_svn.h
index a2e1790..f15c14f 100644
--- a/subversion/mod_dav_svn/dav_svn.h
+++ b/subversion/mod_dav_svn/dav_svn.h
@@ -2,7 +2,7 @@
* dav_svn.h: types, functions, macros for the DAV/SVN Apache module
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/subversion/mod_dav_svn/deadprops.c b/subversion/mod_dav_svn/deadprops.c
index 41240cb..2fad1bf 100644
--- a/subversion/mod_dav_svn/deadprops.c
+++ b/subversion/mod_dav_svn/deadprops.c
@@ -2,7 +2,7 @@
* deadprops.c: mod_dav_svn dead property provider functions for Subversion
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/subversion/mod_dav_svn/liveprops.c b/subversion/mod_dav_svn/liveprops.c
index ada8dea..7d901a7 100644
--- a/subversion/mod_dav_svn/liveprops.c
+++ b/subversion/mod_dav_svn/liveprops.c
@@ -2,7 +2,7 @@
* liveprops.c: mod_dav_svn live property provider functions for Subversion
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/subversion/mod_dav_svn/log.c b/subversion/mod_dav_svn/log.c
index 5d3ea80..1c8d065 100644
--- a/subversion/mod_dav_svn/log.c
+++ b/subversion/mod_dav_svn/log.c
@@ -2,7 +2,7 @@
* log.c: handle the log-report request and response
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -58,6 +58,20 @@
}
+/* If LRB->needs_header is true, send the "<S:log-report>" start
+ element and set LRB->needs_header to zero. Else do nothing. */
+static void maybe_send_header(struct log_receiver_baton *lrb)
+{
+ if (lrb->needs_header)
+ {
+ send_xml(lrb,
+ DAV_XML_HEADER DEBUG_CR
+ "<S:log-report xmlns:S=\"" SVN_XML_NAMESPACE "\" "
+ "xmlns:D=\"DAV:\">" DEBUG_CR);
+ lrb->needs_header = FALSE;
+ }
+}
+
/* This implements `svn_log_message_receiver_t'.
BATON is a `struct log_receiver_baton *'. */
static svn_error_t * log_receiver(void *baton,
@@ -70,15 +84,7 @@
{
struct log_receiver_baton *lrb = baton;
- if (lrb->needs_header)
- {
- /* Start the log report. */
- send_xml(lrb,
- DAV_XML_HEADER DEBUG_CR
- "<S:log-report xmlns:S=\"" SVN_XML_NAMESPACE "\" "
- "xmlns:D=\"DAV:\">" DEBUG_CR);
- lrb->needs_header = FALSE;
- }
+ maybe_send_header(lrb);
send_xml(lrb,
"<S:log-item>" DEBUG_CR
@@ -300,6 +306,7 @@
}
/* End the log report. */
+ maybe_send_header(&lrb);
send_xml(&lrb, "</S:log-report>" DEBUG_CR);
/* flush the contents of the brigade */
diff --git a/subversion/mod_dav_svn/merge.c b/subversion/mod_dav_svn/merge.c
index 1860c22..da7a295 100644
--- a/subversion/mod_dav_svn/merge.c
+++ b/subversion/mod_dav_svn/merge.c
@@ -2,7 +2,7 @@
* merge.c: handle the MERGE response processing
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/subversion/mod_dav_svn/mod_dav_svn.c b/subversion/mod_dav_svn/mod_dav_svn.c
index 2ccacd6..ad602ab 100644
--- a/subversion/mod_dav_svn/mod_dav_svn.c
+++ b/subversion/mod_dav_svn/mod_dav_svn.c
@@ -3,7 +3,7 @@
* repository.
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/subversion/mod_dav_svn/mod_dav_svn.dsp b/subversion/mod_dav_svn/mod_dav_svn.dsp
index 16ebbc4..2bd0e0e 100644
--- a/subversion/mod_dav_svn/mod_dav_svn.dsp
+++ b/subversion/mod_dav_svn/mod_dav_svn.dsp
@@ -657,6 +657,23 @@
# End Source File
# Begin Source File
+SOURCE="..\libsvn_repos\fs-wrap.c"
+
+!IF "$(CFG)" == "mod_dav_svn - Win32 Release"
+
+# PROP Intermediate_Dir "Release\obj\libsvn_repos"
+# ADD CPP /I "..\libsvn_repos" /I "..\..\..\httpd-2.0\srclib\apr\include" /I "..\..\..\httpd-2.0\srclib\apr-util\include" /I "..\..\..\httpd-2.0\srclib\apr-util\xml\expat\lib" /I "..\include" /I "..\.."
+
+!ELSEIF "$(CFG)" == "mod_dav_svn - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\obj\libsvn_repos"
+# ADD CPP /I "..\libsvn_repos" /I "..\..\..\httpd-2.0\srclib\apr\include" /I "..\..\..\httpd-2.0\srclib\apr-util\include" /I "..\..\..\httpd-2.0\srclib\apr-util\xml\expat\lib" /I "..\include" /I "..\.."
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=..\libsvn_repos\load.c
!IF "$(CFG)" == "mod_dav_svn - Win32 Release"
@@ -821,6 +838,23 @@
# End Source File
# Begin Source File
+SOURCE="..\libsvn_fs\bdb\bdb-err.c"
+
+!IF "$(CFG)" == "mod_dav_svn - Win32 Release"
+
+# PROP Intermediate_Dir "Release\obj\libsvn_fs\bdb"
+# ADD CPP /I "..\libsvn_fs" /I "..\..\db4-win32\include" /I "..\..\..\httpd-2.0\srclib\apr\include" /I "..\..\..\httpd-2.0\srclib\apr-util\include" /I "..\..\..\httpd-2.0\srclib\apr-util\xml\expat\lib" /I "..\include" /I "..\.."
+
+!ELSEIF "$(CFG)" == "mod_dav_svn - Win32 Debug"
+
+# PROP Intermediate_Dir "Debug\obj\libsvn_fs\bdb"
+# ADD CPP /I "..\libsvn_fs" /I "..\..\db4-win32\include" /I "..\..\..\httpd-2.0\srclib\apr\include" /I "..\..\..\httpd-2.0\srclib\apr-util\include" /I "..\..\..\httpd-2.0\srclib\apr-util\xml\expat\lib" /I "..\include" /I "..\.."
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE="..\libsvn_fs\bdb\changes-table.c"
!IF "$(CFG)" == "mod_dav_svn - Win32 Release"
diff --git a/subversion/mod_dav_svn/repos.c b/subversion/mod_dav_svn/repos.c
index a6338ca..e13872e 100644
--- a/subversion/mod_dav_svn/repos.c
+++ b/subversion/mod_dav_svn/repos.c
@@ -2,7 +2,7 @@
* repos.c: mod_dav_svn repository provider functions for Subversion
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/subversion/mod_dav_svn/update.c b/subversion/mod_dav_svn/update.c
index 2646b13..258829c 100644
--- a/subversion/mod_dav_svn/update.c
+++ b/subversion/mod_dav_svn/update.c
@@ -2,7 +2,7 @@
* update.c: handle the update-report request and response
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/subversion/mod_dav_svn/util.c b/subversion/mod_dav_svn/util.c
index ece0bca..d5956b5 100644
--- a/subversion/mod_dav_svn/util.c
+++ b/subversion/mod_dav_svn/util.c
@@ -2,7 +2,7 @@
* util.c: some handy utilities functions
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
diff --git a/subversion/mod_dav_svn/version.c b/subversion/mod_dav_svn/version.c
index 96f66b0..121ebae 100644
--- a/subversion/mod_dav_svn/version.c
+++ b/subversion/mod_dav_svn/version.c
@@ -2,7 +2,7 @@
* version.c: mod_dav_svn versioning provider functions for Subversion
*
* ====================================================================
- * Copyright (c) 2000-2002 CollabNet. All rights reserved.
+ * Copyright (c) 2000-2003 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
