* server/request.c (core_opts_merge): When AllowOverride is specified

for the directory, ignore the inherited override_opts field.

PR: 35330
Submitted by: kabe <kabe sra-tohoku.co.jp>

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 c5dc5e9889a418343a501217cbede70a592e17a7..7b4f67ea9f1a90816cd6855fe2714f7d443f0743 100644 (file)
--- 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 <kabe sra-tohoku.co.jp>]
+
   *) 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 962a53716d49994b18d51bd8bae2a1aedf7f5e3d..056ccb04bb19d4207b342b4465bcb5ba2721f096 100644 (file)
--- 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;
     }
 }