Commit c70fc9f5 authored by Ken Coar's avatar Ken Coar
Browse files 

	Clarify some sectional concerns.

Submitted by:	Lars Eilebrecht <Lars.Eilebrecht@unix-ag.org>, Ken Coar


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

docs/manual/mod/core.html

+11 −2
Changes for docs/manual/mod/core.html: 11 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1321,7 +1321,8 @@ require valid-user<BR> 
If an access control directive appears outside a &lt;Limit&gt;

directive, then it applies to all access methods. The method names

listed can be one or more of: GET, POST, PUT, DELETE, CONNECT or

OPTIONS. If GET is used it will also restrict HEAD requests.

OPTIONS. <STRONG>The method name is case-sensitive.</STRONG>

If GET is used it will also restrict HEAD requests.

<STRONG>If you wish to limit all methods, do not include any

&lt;Limit&gt; directive at all.</STRONG> <P><HR>
@@ -1889,7 +1890,7 @@ a particular directory. 
the extra features are enabled, or one or more of the following:

<DL>

<DT>All

<DD>All options except for MultiViews.

<DD>All options except for MultiViews. This is the default setting.

<DT>ExecCGI

<DD>

<!--%plaintext &lt;?INDEX {\tt ExecCGI} option&gt; -->
@@ -1898,10 +1899,15 @@ Execution of CGI scripts is permitted. 
<DD>

<!--%plaintext &lt;?INDEX {\tt FollowSymLinks} option&gt; -->

The server will follow symbolic links in this directory.

<br>

<STRONG>Note</STRONG>: even though the server follows the symlink it

does <EM>not</EM>

change the pathname used to match against <CODE>&lt;Directory&gt;</CODE>

sections.

<br>

<STRONG>Note</STRONG>: this option gets ignored if set inside a

&lt;Location&gt; section.



<DT>Includes

<DD>

<!--%plaintext &lt;?INDEX {\tt Includes} option&gt; -->
@@ -1927,6 +1933,9 @@ allowed. 
<!--%plaintext &lt;?INDEX {\tt SymLinksIfOwnerMatch} option&gt; -->

The server will only follow symbolic links for which the target

file or directory is owned by the same user id as the link.

<br>

<STRONG>Note</STRONG>: this option gets ignored if set inside a

&lt;Location&gt; section.

</DL>



Normally, if multiple <CODE>Options</CODE> could apply to a directory,

docs/manual/sections.html

+33 −6
Changes for docs/manual/sections.html: 33 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ request URL. 
Everything that is syntactically allowed in

<CODE>&lt;Directory&gt;</CODE> is also allowed in

<CODE>&lt;Location&gt;</CODE> (except a sub-<CODE>&lt;Files&gt;</CODE>

section, but the code doesn't test for that, Lars has an open bug

report on that).  Semantically however some things, and the most

notable is AllowOverride, make no sense in

<CODE>&lt;Location&gt;</CODE>.  The same for

section).  Semantically however some things, and the most

notable are <CODE>AllowOverride</CODE> and the two options

<CODE>FollowSymLinks</CODE> and <CODE>SymLinksIfOwnerMatch</CODE>,

make no sense in <CODE>&lt;Location&gt;</CODE>.  The same for

<CODE>&lt;Files&gt;</CODE> -- syntactically everything is fine, but

semantically some things are different.
@@ -118,13 +118,40 @@ But a notable exception is: 
</LI>

</UL>



Note also that modifying .htaccess parsing during Location doesn't do

<P>

Note about .htaccess parsing:

</P>

<UL>

<LI>

    Modifying .htaccess parsing during Location doesn't do

    anything because .htaccess parsing has already occurred.

</UL>



<P>

<CODE>&lt;Location&gt;</CODE> and symbolic links:

</P>

<UL>

<LI>

    It is not possible to use "<CODE>Options FollowSymLinks</CODE>"

    or "<CODE>Options SymLinksIfOwnerMatch</CODE>" inside a

    <CODE>&lt;Location&gt;</CODE>/<CODE>&lt;LocationMatch&gt;</CODE> section

    (the options are simply ignored).

    Using the options in question is only possible inside a

    <CODE>&lt;Directory&gt;</CODE> section (or a <CODE>.htaccess</CODE> file).

</UL>



<P>

<CODE>&lt;Files&gt;</CODE> and <CODE>Options</CODE>:

</P>

<UL>

<LI>

    Apache won't check for it, but using an <CODE>Options</CODE>

    directive inside a <CODE>&lt;Files&gt;</CODE> section has no effect.

</UL>



Another note:

<P>

Another note:

</P>



<UL>

<LI>

docs/manual/sections.html.en

+33 −6
Changes for docs/manual/sections.html.en: 33 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ request URL. 
Everything that is syntactically allowed in

<CODE>&lt;Directory&gt;</CODE> is also allowed in

<CODE>&lt;Location&gt;</CODE> (except a sub-<CODE>&lt;Files&gt;</CODE>

section, but the code doesn't test for that, Lars has an open bug

report on that).  Semantically however some things, and the most

notable is AllowOverride, make no sense in

<CODE>&lt;Location&gt;</CODE>.  The same for

section).  Semantically however some things, and the most

notable are <CODE>AllowOverride</CODE> and the two options

<CODE>FollowSymLinks</CODE> and <CODE>SymLinksIfOwnerMatch</CODE>,

make no sense in <CODE>&lt;Location&gt;</CODE>.  The same for

<CODE>&lt;Files&gt;</CODE> -- syntactically everything is fine, but

semantically some things are different.
@@ -118,13 +118,40 @@ But a notable exception is: 
</LI>

</UL>



Note also that modifying .htaccess parsing during Location doesn't do

<P>

Note about .htaccess parsing:

</P>

<UL>

<LI>

    Modifying .htaccess parsing during Location doesn't do

    anything because .htaccess parsing has already occurred.

</UL>



<P>

<CODE>&lt;Location&gt;</CODE> and symbolic links:

</P>

<UL>

<LI>

    It is not possible to use "<CODE>Options FollowSymLinks</CODE>"

    or "<CODE>Options SymLinksIfOwnerMatch</CODE>" inside a

    <CODE>&lt;Location&gt;</CODE>/<CODE>&lt;LocationMatch&gt;</CODE> section

    (the options are simply ignored).

    Using the options in question is only possible inside a

    <CODE>&lt;Directory&gt;</CODE> section (or a <CODE>.htaccess</CODE> file).

</UL>



<P>

<CODE>&lt;Files&gt;</CODE> and <CODE>Options</CODE>:

</P>

<UL>

<LI>

    Apache won't check for it, but using an <CODE>Options</CODE>

    directive inside a <CODE>&lt;Files&gt;</CODE> section has no effect.

</UL>



Another note:

<P>

Another note:

</P>



<UL>

<LI>