On Sat, Nov 6, 2010 at 10:57 AM, Rainer Jung <rainer.j...@kippdata.de> wrote: > On 06.11.2010 15:37, Ruediger Pluem wrote: >> >> On 11/05/2010 09:21 PM, cove...@apache.org wrote: >>> >>> Author: covener >>> Date: Fri Nov 5 20:21:09 2010 >>> New Revision: 1031776 >>> >>> URL: http://svn.apache.org/viewvc?rev=1031776&view=rev >>> Log: >>> PR49823: Make the hardcoded default for AllowOverride match the default >>> config -- None. >>> >>> >>> Modified: >>> httpd/httpd/trunk/CHANGES >>> httpd/httpd/trunk/docs/manual/mod/core.xml >>> httpd/httpd/trunk/server/core.c >> >> dified: httpd/httpd/trunk/server/core.c >>> >>> URL: >>> http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1031776&r1=1031775&r2=1031776&view=diff >>> >>> ============================================================================== >>> --- httpd/httpd/trunk/server/core.c (original) >>> +++ httpd/httpd/trunk/server/core.c Fri Nov 5 20:21:09 2010 >>> @@ -114,7 +114,7 @@ static void *create_core_dir_config(apr_ >>> >>> conf->opts = dir ? OPT_UNSET : OPT_UNSET|OPT_ALL; >>> conf->opts_add = conf->opts_remove = OPT_NONE; >>> - conf->override = dir ? OR_UNSET : OR_UNSET|OR_ALL; >>> + conf->override = OR_NONE; >> >> I guess it should be OR_NONE|OR_UNSET instead as otherwise merging breaks. > > He already fixed it in r1031794.
Thanks as always for the review though. This hit a few things in the test suite indirectly FWIW.
