Commit 90354719 authored by dgaudet's avatar dgaudet
Browse files

"Options +Includes" wasn't corrently merged if "+IncludesNoExec" 

was defined in a parent directory.

Submitted by:	Lars Eilebrecht


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@80720 13f79535-47bb-0310-9956-ffa450edef68
parent ec0e41e3

docs/manual/mod/core.html

+3 −0
Changes for docs/manual/mod/core.html: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1818,6 +1818,9 @@ Options +Includes -Indexes<BR> 
then the options <CODE>FollowSymLinks</CODE> and <CODE>Includes</CODE>

are set for the /web/docs/spec directory.<P>



<STRONG>Note:</STRONG> Using <CODE>-IncludesNOEXEC</CODE> or <CODE>-Includes</CODE>

disables server-side includes completely regardless of the previous setting.<P>



The default in the absence of any other settings is <CODE>All</CODE>.<P>

<HR>