On Wed, Nov 09, 2022 at 08:19:47AM +0100, Ruediger Pluem wrote: > Better do not set it here, but leave it to 0 aka DAV_ENABLED_UNSET. > This makes it possible to use DAV_INHERIT_VALUE in dav_merge_dir_config > The corresponding code for dav_merge_dir_config is missing in this this patch.
It was committed before: newconf->allow_lockdiscovery = DAV_INHERIT_VALUE(parent, child, allow_lockdiscovery); The chnage below this seems to be enough to do the job. allow_lockdiscovery is only checked against DAV_ENABLED_OFF, hence DAV_ENABLED_UNSET and DAV_ENABLED_ON have the same effect, which is what is desired for backward compatibility sake. Index: modules/dav/main/mod_dav.c =================================================================== --- modules/dav/main/mod_dav.c (revision 1905191) +++ modules/dav/main/mod_dav.c (working copy) @@ -160,7 +160,7 @@ conf = (dav_dir_conf *)apr_pcalloc(p, sizeof(*conf)); - conf->allow_lockdiscovery = DAV_ENABLED_ON; + conf->allow_lockdiscovery = DAV_ENABLED_UNSET; /* clean up the directory to remove any trailing slash */ if (dir != NULL) { -- Emmanuel Dreyfus m...@netbsd.org