From: Jeff Trawick <trawick@apache.org>
Date: Mon, 9 Apr 2007 20:56:01 +0000 (+0000)
Subject: merge from trunk:
X-Git-Tag: 2.2.5~289
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d22ed37c5d07b3a07cf2a23424279f9b1a7d0b6;p=thirdparty%2Fapache%2Fhttpd.git

merge from trunk:

core: Correct a regression since 2.0.x in the handling of AllowOverride
Options.

PR: 41829

Submitted by: Torsten Förtsch <torsten.foertsch gmx.net>
Reviewed by: niq, rpluem, trawick



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@526912 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index a13d47fe930..bd22d927b14 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.5
 
+  *) core: Correct a regression since 2.0.x in the handling of AllowOverride 
+     Options.  PR 41829.  [Torsten Förtsch <torsten.foertsch gmx.net>]
+
   *) mod_proxy_http: Handle request bodies larger than 2 GB by converting
      the Content-Length header of the request correctly. PR 40883.
      [Ruediger Pluem, toadie <toadie643 gmail.com>]
diff --git a/STATUS b/STATUS
index 868babfe724..cb7e51e3654 100644
--- a/STATUS
+++ b/STATUS
@@ -201,14 +201,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      http://svn.apache.org/viewvc?rev=499567&view=rev
      +1: niq, rpluem
 
-   * server/request.c: fix uninitialised config var
-     PR: 41829
-     http://svn.apache.org/viewvc?rev=522011&view=rev
-     +1: niq
-     rpluem says: Please also add
-                  http://svn.apache.org/viewvc?view=rev&rev=522084
-                  to remove the tab. Otherwise +1.
-
    * support/htdbm.c: Enable crypt() support on platforms with crypt() but not
      <crypt.h>, such as z/OS.
      Trunk version of patch:
diff --git a/server/request.c b/server/request.c
index 1aff73048dd..42696246b1c 100644
--- a/server/request.c
+++ b/server/request.c
@@ -615,6 +615,7 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r)
         opts.add = this_dir->opts_add;
         opts.remove = this_dir->opts_remove;
         opts.override = this_dir->override;
+        opts.override_opts = this_dir->override_opts;
 
         /* Set aside path_info to merge back onto path_info later.
          * If r->filename is a directory, we must remerge the path_info,