[PATCH] Includes/IncludesNOEXEC merging bug

[Lars Eilebrecht <La...@unix-ag.org>]

Hi,

This config:

 <Directory /foo>
 Options +Includes
 </Directory>

 <Directory /foo/bar>
 Options +IncludesNOEXEC
 
works as expected, but this one

 <Directory /foo>
 Options +IncludesNOEXEC
 </Directory>

 <Directory /foo/bar>
 Options +Includes
 </Directory>

does not, because the extra bit from OPT_INCNOEXEC is always merged
into conf->opts.

The attached patch checks for such a configuration and clears out
that extra bit. If +Includes and +IncludesNOEXEC is used on the
same line the one that appears first will take precedence.

I also added a note about "-Includes" and "-IncludesNOEXEC"
to mod/core.html.


ciao...
-- 
Lars Eilebrecht                          - Brain fried... core dumped.
sfx@unix-ag.org
http://www.home.unix-ag.org/sfx/