Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 71061 invoked from network); 9 May 2009 21:25:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 May 2009 21:25:18 -0000 Received: (qmail 86368 invoked by uid 500); 9 May 2009 21:25:17 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 86289 invoked by uid 500); 9 May 2009 21:25:16 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 86280 invoked by uid 99); 9 May 2009 21:25:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 May 2009 21:25:16 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of covener@gmail.com designates 209.85.220.162 as permitted sender) Received: from [209.85.220.162] (HELO mail-fx0-f162.google.com) (209.85.220.162) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 May 2009 21:25:07 +0000 Received: by fxm6 with SMTP id 6so2351974fxm.24 for ; Sat, 09 May 2009 14:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=Mel4rrMqo9sFnr47bKlJ6GHt1gsPkpzezT/F4XS8gfc=; b=J3SqdX5QI9wEooDPPt1JyYR3BPqsVa6vodODa+wPsEOqq7lb3ETKKEk5KTZoc4mD/E QXp+RBJhMn+D4b66qZz3to2uJQEyOoCAuNKa9oVdswh6o3nSnjsme2C8nMz1hN/pf2/f ABIG7xOoJhtn+FfqZF/MI+dfWFiRNU0TqFYUI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=m646GyoJZ7gLFoNE3iaOUbyfC4zdGxOiZZDLSL3/v0ywkEM3xktgWdSM8NskDwLp1M OuAyKy+mCgtF7cuzt0KJ2MqWXv9qtgNx0X/TXOjQDBxqkJzTwcLv3YVwXUL4EdigyFeF qtjmPIQquoQVbjD7QGhqAnooVrWKgTqDW0gdA= MIME-Version: 1.0 Received: by 10.223.114.208 with SMTP id f16mr2836551faq.91.1241904286968; Sat, 09 May 2009 14:24:46 -0700 (PDT) In-Reply-To: <1404e5910905091116l427847cch215a76209fac110a@mail.gmail.com> References: <20090508141316.4EC0223888A2@eris.apache.org> <1404e5910905091116l427847cch215a76209fac110a@mail.gmail.com> Date: Sat, 9 May 2009 17:24:46 -0400 Message-ID: <1404e5910905091424t18ac2326j228fb441ff7ff717@mail.gmail.com> Subject: Re: svn commit: r772997 - in /httpd/httpd/trunk: include/http_core.h modules/filters/mod_include.c server/config.c server/core.c From: Eric Covener To: dev@httpd.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org On Sat, May 9, 2009 at 2:16 PM, Eric Covener wrote: > On Fri, May 8, 2009 at 10:13 AM, =A0 wrote: > >> + >> + =A0 =A0 =A0 =A0/* if Includes was enabled without exec in the new conf= ig, but >> + =A0 =A0 =A0 =A0 * was enabled with exec in the base, then disable exec= in the >> + =A0 =A0 =A0 =A0 * resulting options. */ >> + =A0 =A0 =A0 =A0if ((base->opts & OPT_INC_WITH_EXEC) >> + =A0 =A0 =A0 =A0 =A0 =A0&& (new->opts & OPT_INC_WITH_EXEC) =3D=3D 0) { >> + =A0 =A0 =A0 =A0 =A0 =A0conf->opts &=3D ~OPT_INC_WITH_EXEC; > > > The above is wrapped in > =A0 =A0if (new->opts & OPT_UNSET) { > > Which means checking new->opts against anything is probably not needed Not likely the case due to test failures removing this block. --=20 Eric Covener covener@gmail.com