Make the SVNAutoversioning command take an "on/off" argument, instead just being present or not. This allows us to set defaults within locations, and override them in sub-locations. * mod_dav_svn.c (dav_svn_cmds, dav_svn_autoversioning_cmd): make SVNAutoversioning take one boolean argument, not zero. apache does the "on/off" parsing for us. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/autoversion@844320 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/mod_dav_svn/mod_dav_svn.c b/subversion/mod_dav_svn/mod_dav_svn.c index ad602ab..6fc8982 100644 --- a/subversion/mod_dav_svn/mod_dav_svn.c +++ b/subversion/mod_dav_svn/mod_dav_svn.c
@@ -129,11 +129,15 @@ return NULL; } -static const char *dav_svn_autoversioning_cmd(cmd_parms *cmd, void *config) +static const char *dav_svn_autoversioning_cmd(cmd_parms *cmd, void *config, + int arg) { dav_svn_dir_conf *conf = config; - conf->autoversioning = TRUE; + if (arg) + conf->autoversioning = TRUE; + else + conf->autoversioning = FALSE; return NULL; } @@ -281,8 +285,8 @@ "subdirectories are assumed to be Subversion repositories."), /* per directory/location */ - AP_INIT_NO_ARGS("SVNAutoversioning", dav_svn_autoversioning_cmd, - NULL, ACCESS_CONF, "turns on deltaV autoversioning."), + AP_INIT_FLAG("SVNAutoversioning", dav_svn_autoversioning_cmd, NULL, + ACCESS_CONF|RSRC_CONF, "turn on deltaV autoversioning."), { NULL } };