summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2010-11-05 22:00:18 +0100
committerEric Covener <covener@apache.org>2010-11-05 22:00:18 +0100
commitefb8c83d0763021b1871fc60bd04ba04b18acbaf (patch)
tree4e53d939664b0127d6f40fb58f61a001874fd2ee /server
parentPR49823: Make the hardcoded default for AllowOverride match the default confi... (diff)
downloadapache2-efb8c83d0763021b1871fc60bd04ba04b18acbaf.tar.xz
apache2-efb8c83d0763021b1871fc60bd04ba04b18acbaf.zip
correction to r1031776, retain OR_UNSET with default AllowOverride None
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031794 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
-rw-r--r--server/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/core.c b/server/core.c
index 9f8d01d02d..e01b4b40ec 100644
--- a/server/core.c
+++ b/server/core.c
@@ -114,7 +114,7 @@ static void *create_core_dir_config(apr_pool_t *a, char *dir)
conf->opts = dir ? OPT_UNSET : OPT_UNSET|OPT_ALL;
conf->opts_add = conf->opts_remove = OPT_NONE;
- conf->override = OR_NONE;
+ conf->override = OR_UNSET|OR_NONE;
conf->override_opts = OPT_UNSET | OPT_ALL | OPT_SYM_OWNER | OPT_MULTI;
conf->content_md5 = 2;