Commit 724b3e19 authored by Lars Eilebrecht's avatar Lars Eilebrecht
Browse files

Updated docs; no FollowSymLinks in <DirectoryMatch> 

PR: 2657
Obtained from: Brian Thomas <wolfie@mpath.com>


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

docs/manual/sections.html

+6 −4
Original line number Diff line number Diff line
@@ -33,9 +33,10 @@ Everything that is syntactically allowed in 
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.

make no sense in <CODE>&lt;Location&gt;</CODE>,

<CODE>&lt;LocationMatch&gt;</CODE> or <CODE>&lt;DirectoryMatch&gt;</CODE>.

The same for <CODE>&lt;Files&gt;</CODE> -- syntactically everything

is fine, but semantically some things are different.



<H2>How the sections are merged</H2>
@@ -134,7 +135,8 @@ Note about .htaccess parsing: 
<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

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

    or <CODE>&lt;DirectoryMatch&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).

docs/manual/sections.html.en

+6 −4
Original line number Diff line number Diff line
@@ -33,9 +33,10 @@ Everything that is syntactically allowed in 
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.

make no sense in <CODE>&lt;Location&gt;</CODE>,

<CODE>&lt;LocationMatch&gt;</CODE> or <CODE>&lt;DirectoryMatch&gt;</CODE>.

The same for <CODE>&lt;Files&gt;</CODE> -- syntactically everything

is fine, but semantically some things are different.



<H2>How the sections are merged</H2>
@@ -134,7 +135,8 @@ Note about .htaccess parsing: 
<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

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

    or <CODE>&lt;DirectoryMatch&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).