Return-Path:
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
by minotaur.apache.org (Postfix) with SMTP id 098579D04
for ;
Sun, 22 Jul 2012 14:40:23 +0000 (UTC)
Received: (qmail 28510 invoked by uid 500); 22 Jul 2012 14:40:22 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 28334 invoked by uid 500); 22 Jul 2012 14:40:22 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help:
list-unsubscribe:
List-Post:
List-Id:
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 28325 invoked by uid 99); 22 Jul 2012 14:40:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2012 14:40:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2012 14:40:21 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
by eris.apache.org (Postfix) with ESMTP id 8A67C2388962;
Sun, 22 Jul 2012 14:40:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1364311 -
/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
Date: Sun, 22 Jul 2012 14:40:02 -0000
To: cvs@httpd.apache.org
From: covener@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120722144002.8A67C2388962@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
Author: covener
Date: Sun Jul 22 14:40:02 2012
New Revision: 1364311
URL: http://svn.apache.org/viewvc?rev=1364311&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.4.x/docs/manual/mod/core.xml
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1364311&r1=1364310&r2=1364311&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Sun Jul 22 14:40:02 2012
@@ -3298,9 +3298,13 @@ directory
Even though the server follows the symlink it does not
change the pathname used to match against Directory sections.
- Note also, that this option gets ignored if set
- inside a Location
- section.
+
+ The FollowSymLinks
and
+ SymLinksIfOwnerMatch
Options work only in Directory sections or
+ .htaccess
files.
+
Omitting this option should not be considered a security restriction,
since symlink testing is subject to race conditions that make it
circumventable.
@@ -3349,13 +3353,17 @@ directory
target file or directory is owned by the same user id as the
link.
- Note This option gets ignored if
- set inside a Location section.
+ Note
+ The FollowSymLinks
and
+ SymLinksIfOwnerMatch
Options work only in Directory sections or
+ .htaccess
files.
+
This option should not be considered a security restriction,
since symlink testing is subject to race conditions that make it
- circumventable.
-
+ circumventable.
+
Normally, if multiple Options could