Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 76105 invoked from network); 23 Sep 2005 14:25:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Sep 2005 14:25:45 -0000 Received: (qmail 57885 invoked by uid 500); 23 Sep 2005 14:25:44 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 57852 invoked by uid 500); 23 Sep 2005 14:25:44 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 57839 invoked by uid 99); 23 Sep 2005 14:25:44 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 23 Sep 2005 07:25:44 -0700 Received: (qmail 75812 invoked by uid 65534); 23 Sep 2005 14:25:24 -0000 Message-ID: <20050923142524.75811.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r291125 - in /httpd/httpd/branches/2.2.x: CHANGES server/request.c Date: Fri, 23 Sep 2005 14:25:23 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 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 ] + *) Fix PR 25659 - Memory leak in ssl_util_algotypeof() [David Blake , 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; } }