You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/01/26 05:04:36 UTC
svn commit: r1561445 - in /subversion/branches/1.8.x: ./ STATUS
subversion/mod_dav_svn/dav_svn.h subversion/mod_dav_svn/mod_dav_svn.c
Author: svn-role
Date: Sun Jan 26 04:04:36 2014
New Revision: 1561445
URL: http://svn.apache.org/r1561445
Log:
Merge r1548105 from trunk:
* r1548105
mod_dav_svn: Fix SVNAllowBulkUpdates directive merging.
Justification:
'SVNAllowBulkUpdates on' does not override other values
configured for other <Location>
Votes:
+1: ivan, rhuijben, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/mod_dav_svn/dav_svn.h
subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1548105
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1561445&r1=1561444&r2=1561445&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Sun Jan 26 04:04:36 2014
@@ -264,11 +264,3 @@ Veto-blocked changes:
Approved changes:
=================
- * r1548105
- mod_dav_svn: Fix SVNAllowBulkUpdates directive merging.
- Justification:
- 'SVNAllowBulkUpdates on' does not override other values
- configured for other <Location>
- Votes:
- +1: ivan, rhuijben, stefan2
-
Modified: subversion/branches/1.8.x/subversion/mod_dav_svn/dav_svn.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/mod_dav_svn/dav_svn.h?rev=1561445&r1=1561444&r2=1561445&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/mod_dav_svn/dav_svn.h (original)
+++ subversion/branches/1.8.x/subversion/mod_dav_svn/dav_svn.h Sun Jan 26 04:04:36 2014
@@ -52,8 +52,11 @@ extern "C" {
/* a pool-key for the shared dav_svn_root used by autoversioning */
#define DAV_SVN__AUTOVERSIONING_ACTIVITY "svn-autoversioning-activity"
-/* Option values for SVNAllowBulkUpdates */
+/* Option values for SVNAllowBulkUpdates. Note that
+ it's important that CONF_BULKUPD_DEFAULT is 0 to make
+ dav_svn_merge_dir_config do the right thing. */
typedef enum dav_svn__bulk_upd_conf {
+ CONF_BULKUPD_DEFAULT,
CONF_BULKUPD_ON,
CONF_BULKUPD_OFF,
CONF_BULKUPD_PREFER
Modified: subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c?rev=1561445&r1=1561444&r2=1561445&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c Sun Jan 26 04:04:36 2014
@@ -214,7 +214,7 @@ create_dir_config(apr_pool_t *p, char *d
<Location /blah> directive. So we treat it as a urlpath. */
if (dir)
conf->root_dir = svn_urlpath__canonicalize(dir, p);
- conf->bulk_updates = CONF_BULKUPD_ON;
+ conf->bulk_updates = CONF_BULKUPD_DEFAULT;
conf->v2_protocol = CONF_FLAG_ON;
conf->hooks_env = NULL;
@@ -812,7 +812,12 @@ dav_svn__get_bulk_updates_flag(request_r
dir_conf_t *conf;
conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
- return conf->bulk_updates;
+
+ /* SVNAllowBulkUpdates is 'on' by default. */
+ if (conf->bulk_updates == CONF_BULKUPD_DEFAULT)
+ return CONF_BULKUPD_ON;
+ else
+ return conf->bulk_updates;
}