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

[tr...@apache.org]

Author: trawick
Date: Mon Apr  9 13:56:01 2007
New Revision: 526912

URL: http://svn.apache.org/viewvc?view=rev&rev=526912
Log:
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


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

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=526912&r1=526911&r2=526912
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Apr  9 13:56:01 2007
@@ -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>]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=526912&r1=526911&r2=526912
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Apr  9 13:56:01 2007
@@ -201,14 +201,6 @@
      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:

Modified: httpd/httpd/branches/2.2.x/server/request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/request.c?view=diff&rev=526912&r1=526911&r2=526912
==============================================================================
--- httpd/httpd/branches/2.2.x/server/request.c (original)
+++ httpd/httpd/branches/2.2.x/server/request.c Mon Apr  9 13:56:01 2007
@@ -615,6 +615,7 @@
         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,