You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2012/07/22 16:42:42 UTC
svn commit: r1364313 - /httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
Author: covener
Date: Sun Jul 22 14:42:42 2012
New Revision: 1364313
URL: http://svn.apache.org/viewvc?rev=1364313&view=rev
Log:
Merge r1364309 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
copy the context restrictions from sections.html for symlink
related options
Modified:
httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml?rev=1364313&r1=1364312&r2=1364313&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/core.xml Sun Jul 22 14:42:42 2012
@@ -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