svn commit: r1791794 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

[st...@apache.org]

Author: stefan2
Date: Tue Apr 18 14:50:07 2017
New Revision: 1791794

URL: http://svn.apache.org/viewvc?rev=1791794&view=rev
Log:
Fix inconsistent handling of FS-related config flags in mod_dav_svn.

* subversion/mod_dav_svn/mod_dav_svn.c
  (dav_svn__get_fulltext_cache_flag,
   dav_svn__get_revprop_cache_flag,
   dav_svn__get_nodeprop_cache_flag,
   dav_svn__get_block_read_flag): Consistently use the get_conf_flag
                                  function and default to FSFS's current
                                  defaults.

Found by: julianfoad

Modified:
    subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1791794&r1=1791793&r2=1791794&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Tue Apr 18 14:50:07 2017
@@ -1003,7 +1003,9 @@ dav_svn__get_fulltext_cache_flag(request
   dir_conf_t *conf;
 
   conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
-  return conf->fulltext_cache == CONF_FLAG_ON;
+
+  /* fulltext caching is enabled by default. */
+  return get_conf_flag(conf->fulltext_cache, TRUE);
 }
 
 
@@ -1013,7 +1015,9 @@ dav_svn__get_revprop_cache_flag(request_
   dir_conf_t *conf;
 
   conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
-  return conf->revprop_cache == CONF_FLAG_ON;
+
+  /* revprop caching is enabled by default. */
+  return get_conf_flag(conf->revprop_cache, TRUE);
 }
 
 svn_boolean_t
@@ -1022,8 +1026,9 @@ dav_svn__get_nodeprop_cache_flag(request
   dir_conf_t *conf;
 
   conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
+
   /* node properties caching is enabled by default. */
-  return get_conf_flag(conf->nodeprop_cache, FALSE);
+  return get_conf_flag(conf->nodeprop_cache, TRUE);
 }
 
 svn_boolean_t
@@ -1032,7 +1037,9 @@ dav_svn__get_block_read_flag(request_rec
   dir_conf_t *conf;
 
   conf = ap_get_module_config(r->per_dir_config, &dav_svn_module);
-  return conf->block_read == CONF_FLAG_ON;
+
+  /* the block-read feature is disabled by default. */
+  return get_conf_flag(conf->block_read, FALSE);
 }
 
 int