From: Joe Orton Date: Fri, 23 Sep 2005 14:11:18 +0000 (+0000) Subject: * server/request.c (core_opts_merge): When AllowOverride is specified X-Git-Tag: 2.3.0~2946 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b6e07b561474fd8f37f81bb017e90930d72fc91;p=apache * server/request.c (core_opts_merge): When AllowOverride is specified for the directory, ignore the inherited override_opts field. PR: 35330 Submitted by: kabe git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@291120 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index c5dc5e9889..7b4f67ea9f 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.3.0 [Remove entries to the current 2.0 and 2.2 section below, when backported] + *) Fix regression since 2.0.x in AllowOverride Options handling. + PR 35330. [kabe ] + *) Move mod_dbd to /modules/database/ (Nick Kew) *) Move mod_filter and mod_charset_lite to /modules/filters/ (Nick Kew) diff --git a/server/request.c b/server/request.c index 962a53716d..056ccb04bb 100644 --- a/server/request.c +++ b/server/request.c @@ -446,8 +446,6 @@ static void core_opts_merge(const ap_conf_vector_t *sec, core_opts_t *opts) if (!(this_dir->override & OR_UNSET)) { opts->override = this_dir->override; - } - if (!(this_dir->override_opts & OR_UNSET)) { opts->override_opts = this_dir->override_opts; } }