From: Ken Coar Date: Fri, 3 Jul 1998 20:12:34 +0000 (+0000) Subject: Clarify some sectional concerns. X-Git-Tag: 1.3.1~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f748f3c606c052934b0dbd18977fc3ee201a02f1;p=thirdparty%2Fapache%2Fhttpd.git Clarify some sectional concerns. Submitted by: Lars Eilebrecht , Ken Coar git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@81644 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html index 17e644ac769..2da61f90c30 100644 --- a/docs/manual/mod/core.html +++ b/docs/manual/mod/core.html @@ -1321,7 +1321,8 @@ require valid-user
If an access control directive appears outside a <Limit> 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. The method name is case-sensitive. +If GET is used it will also restrict HEAD requests. If you wish to limit all methods, do not include any <Limit> directive at all.

@@ -1889,7 +1890,7 @@ a particular directory. the extra features are enabled, or one or more of the following:
All -
All options except for MultiViews. +
All options except for MultiViews. This is the default setting.
ExecCGI
@@ -1898,10 +1899,15 @@ Execution of CGI scripts is permitted.
The server will follow symbolic links in this directory. +
Note: even though the server follows the symlink it does not change the pathname used to match against <Directory> sections. +
+Note: this option gets ignored if set inside a +<Location> section. +
Includes
@@ -1927,6 +1933,9 @@ allowed. The server will only follow symbolic links for which the 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.
Normally, if multiple Options could apply to a directory, diff --git a/docs/manual/sections.html b/docs/manual/sections.html index a8e4756d920..cfa2abe40dc 100644 --- a/docs/manual/sections.html +++ b/docs/manual/sections.html @@ -30,10 +30,10 @@ request URL. Everything that is syntactically allowed in <Directory> is also allowed in <Location> (except a sub-<Files> -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 -<Location>. The same for +section). Semantically however some things, and the most +notable are AllowOverride and the two options +FollowSymLinks and SymLinksIfOwnerMatch, +make no sense in <Location>. The same for <Files> -- syntactically everything is fine, but semantically some things are different. @@ -118,13 +118,40 @@ But a notable exception is: -Note also that modifying .htaccess parsing during Location doesn't do -anything because .htaccess parsing has already occurred. +

+Note about .htaccess parsing: +

+ + +

+<Location> and symbolic links: +

+

+<Files> and Options: +

+ -Another note:

+Another note: +

-Note also that modifying .htaccess parsing during Location doesn't do -anything because .htaccess parsing has already occurred. +

+Note about .htaccess parsing: +

+ + +

+<Location> and symbolic links: +

+

+<Files> and Options: +

+ -Another note:

+Another note: +