On Sat, May 9, 2009 at 5:55 PM, Ruediger Pluem <[email protected]> wrote: > > > On 05/09/2009 08:16 PM, Eric Covener wrote: > >> >> This zaps OPT_INC_WITH_EXEC for a config w/o the htaccess issue (the >> real focus of the change): >> >> # only two containers in the config >> >> <Directory /> >> Options Includes >> AllowOverride None >> </Directory> >> >> <Directory /home/covener> >> # with this container, mod_cgi/mod_cgid complains about exec being off >> # without it, exec cmd= works as expected >> SetEnv foo bar >> </Directory> > > I guess this behaviour is not expected. Does the following patch fix this > (it still passes all test cases): > > Index: server/core.c > =================================================================== > --- 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. -- Eric Covener [email protected]
