From: Eric Covener <covener@apache.org>
Date: Fri, 5 Nov 2010 21:00:18 +0000 (+0000)
Subject: correction to r1031776, retain OR_UNSET with default AllowOverride None
X-Git-Tag: 2.3.9~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efb8c83d0763021b1871fc60bd04ba04b18acbaf;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/server/core.c b/server/core.c
index 9f8d01d02d8..e01b4b40ecc 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;