svn commit: r291125 - in /httpd/httpd/branches/2.2.x: CHANGES server/request.c

[jo...@apache.org]

Author: jorton
Date: Fri Sep 23 07:25:19 2005
New Revision: 291125

URL: http://svn.apache.org/viewcvs?rev=291125&view=rev
Log:
Merge r291120 from trunk:

* 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>
Reviewed by: jorton

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/server/request.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=291125&r1=291124&r2=291125&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Sep 23 07:25:19 2005
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.1.8
 
+  *) Fix regression since 2.0.x in AllowOverride Options handling. 
+     PR 35330.  [kabe <kabe sra-tohoku.co.jp>]
+
   *) Fix PR 25659 - Memory leak in ssl_util_algotypeof()
      [David Blake <dblake hp com>, Martin Kraemer]
 

Modified: httpd/httpd/branches/2.2.x/server/request.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/request.c?rev=291125&r1=291124&r2=291125&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/request.c (original)
+++ httpd/httpd/branches/2.2.x/server/request.c Fri Sep 23 07:25:19 2005
@@ -445,8 +445,6 @@
 
     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;
     }
 }