Re: svn commit: r772997 - in /httpd/httpd/trunk: include/http_core.h modules/filters/mod_include.c server/config.c server/core.c

[Joe Orton <jo...@redhat.com>]

On Sun, May 10, 2009 at 12:32:44PM +0200, Ruediger Pluem wrote:
> On 05/10/2009 12:26 AM, Eric Covener wrote:
> > On Sat, May 9, 2009 at 5:55 PM, Ruediger Pluem <rp...@apache.org> wrote:
> >> --- server/core.c       (Revision 773105)
> >> +++ server/core.c       (Arbeitskopie)
> >> @@ -242,8 +242,9 @@
> >>         /* if Includes was enabled without exec in the new config, but
> >>          * was enabled with exec in the base, then disable exec in the
> >>          * resulting options. */
> >> -        if ((base->opts & OPT_INC_WITH_EXEC)
> >> -            && (new->opts & OPT_INC_WITH_EXEC) == 0) {
> >> +        if ((base->opts & OPT_INC_WITH_EXEC)
> >> +            && (new->opts & OPT_INC_WITH_EXEC) == 0
> >> +            && (new->opts & OPT_INCLUDES)) {
> >>             conf->opts &= ~OPT_INC_WITH_EXEC;
> >>         }
> >>     }
> > 
> > Works for me.  My response after the one you quoted was a SNAFU with
> > my test configuration and didn't really help my non-htaccess case.
> 
> Commited as r773322.

Thanks a lot guys, and good catch Eric - just goes to show that no 120 
cell test matrix is ever complete ;) I've tweaked that change slightly 
in r773342.

Regards, Joe