Commit 624100dd authored by Eric Covener's avatar Eric Covener
Browse files

Merge r1364309 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/: 

copy the context restrictions from sections.html for symlink
related options



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1364313 13f79535-47bb-0310-9956-ffa450edef68
parent 10184f26

docs/manual/mod/core.xml

+16 −8
Original line number Diff line number Diff line
@@ -2469,9 +2469,13 @@ directory</description> 
      <p>Even though the server follows the symlink it does <em>not</em>

      change the pathname used to match against <directive type="section"

      module="core">Directory</directive> sections.</p>

      <p>Note also, that this option <strong>gets ignored</strong> if set

      inside a <directive type="section" module="core">Location</directive>

      section.</p>



      <p>The <code>FollowSymLinks</code> and

      <code>SymLinksIfOwnerMatch</code> <directive

      module="core">Options</directive> work only in <directive

      type="section" module="core">Directory</directive> sections or

      <code>.htaccess</code> files.</p>



      <p>Omitting this option should not be considered a security restriction,

      since symlink testing is subject to race conditions that make it

      circumventable.</p>
@@ -2515,13 +2519,17 @@ directory</description> 
      target file or directory is owned by the same user id as the

      link.



      <note><title>Note</title> <p>This option gets ignored if

      set inside a <directive module="core"

      type="section">Location</directive> section.</p>

      <note><title>Note</title>

      <p>The <code>FollowSymLinks</code> and

      <code>SymLinksIfOwnerMatch</code> <directive

      module="core">Options</directive> work only in <directive

      type="section" module="core">Directory</directive> sections or

      <code>.htaccess</code> files.</p>



      <p>This option should not be considered a security restriction,

      since symlink testing is subject to race conditions that make it

      circumventable.</p></note>

      </dd>

      circumventable.</p>

      </note> </dd>

    </dl>



    <p>Normally, if multiple <directive>Options</directive> could