On Sat, May 9, 2009 at 5:24 PM, Eric Covener <[email protected]> wrote:
> On Sat, May 9, 2009 at 2:16 PM, Eric Covener <[email protected]> wrote:
>> On Fri, May 8, 2009 at 10:13 AM, <[email protected]> wrote:
>>
>>> +
>>> + /* 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) {
>>> + conf->opts &= ~OPT_INC_WITH_EXEC;
>>
>>
>> The above is wrapped in
>> if (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.
Both failures are testing the tweak discussed in the other thread:
| 5) I'll post an updated patch soon which fixes the behaviour of "Options
| Includes"/"Options +IncludesNoExec" such that SSI is permitted without
| exec, as is the current 2.2.x behaviour, since that seems to be the
| rough consensus. Jon also spotted a minor logic flaw in the patch which
| I'll fix too.
### Test #82, context: Options Includes : AllowOverride
Options=IncludesNoExec : Options +IncludesNoExec
### Test #102, context: Options Includes: AllowOverride ALl; Options
+IncludesNoexec
Both failers [and rest of suite] , along with my non-htaccess issue,
seem to be corrected with:
- && (new->opts & OPT_INC_WITH_EXEC) == 0) {
+ && (new->opts_add & OPT_INC_WITH_EXEC) == 0) {
--
Eric Covener
[email protected]
