From 97318f9e2046169c8dfb18cd9e97b99994435587 Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Tue, 12 Sep 2000 15:16:59 +0000 Subject: [PATCH] allow->Allow, deny->Deny, order->Order and require->Require. All directives are now consistently capitalized. PR: Obtained from: Submitted by: Rich Bowen Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86205 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/location.html | 6 +- docs/manual/misc/FAQ-G.html | 10 +-- docs/manual/misc/FAQ.html | 4 +- docs/manual/misc/perf-tuning.html | 4 +- docs/manual/misc/security_tips.html | 8 +-- docs/manual/mod/core.html | 39 +++++----- docs/manual/mod/directives.html | 8 +-- docs/manual/mod/mod_access.html | 104 ++++++++++++++------------- docs/manual/mod/mod_auth.html | 2 +- docs/manual/mod/mod_auth_anon.html | 6 +- docs/manual/mod/mod_auth_db.html | 2 +- docs/manual/mod/mod_auth_dbm.html | 2 +- docs/manual/mod/mod_auth_digest.html | 2 +- docs/manual/mod/mod_proxy.html | 6 +- docs/manual/mod/mod_status.html | 6 +- docs/manual/platform/readme-tpf.html | 2 +- docs/manual/vhosts/examples.html | 6 +- docs/manual/vhosts/host.html | 2 +- 18 files changed, 111 insertions(+), 108 deletions(-) diff --git a/docs/manual/location.html b/docs/manual/location.html index 2dddd2ee2c..284371267e 100644 --- a/docs/manual/location.html +++ b/docs/manual/location.html @@ -56,9 +56,9 @@ from browsers at foo.com, you might use: 
     <Location /status>
     SetHandler server-status
-    order deny,allow
-    deny from all
-    allow from .foo.com
+    Order Deny,Allow
+    Deny from all
+    Allow from .foo.com
     </Location>
diff --git a/docs/manual/misc/FAQ-G.html b/docs/manual/misc/FAQ-G.html index 0edc6997e9..e65537f51a 100644 --- a/docs/manual/misc/FAQ-G.html +++ b/docs/manual/misc/FAQ-G.html @@ -31,7 +31,7 @@

Apache Server Frequently Asked Questions

- $Revision: 1.3 $ ($Date: 2000/04/18 20:54:03 $) + $Revision: 1.4 $ ($Date: 2000/09/12 15:16:45 $)

The latest version of this FAQ is always available from the main @@ -192,9 +192,9 @@

-
deny from all +
Deny from all
- allow from .domain.com + Allow from .domain.com
AuthType Basic
@@ -202,9 +202,9 @@
AuthName "special directory"
- require valid-user + Require valid-user
- satisfy any + Satisfy any

diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html index b9a926f84a..eaf0ac371f 100644 --- a/docs/manual/misc/FAQ.html +++ b/docs/manual/misc/FAQ.html @@ -15,7 +15,7 @@

Apache Server Frequently Asked Questions

- $Revision: 1.145 $ ($Date: 1999/06/24 15:02:53 $) + $Revision: 1.146 $ ($Date: 2000/09/12 15:16:46 $)

The latest version of this FAQ is always available from the main @@ -77,7 +77,7 @@ - + diff --git a/docs/manual/misc/perf-tuning.html b/docs/manual/misc/perf-tuning.html index c9c1348c80..85a527afa5 100644 --- a/docs/manual/misc/perf-tuning.html +++ b/docs/manual/misc/perf-tuning.html @@ -71,8 +71,8 @@ recent FreeBSD, and Linux. This adds latency to every request because it requires a DNS lookup to complete before the request is finished. In Apache 1.3 this setting defaults to Off. -However (1.3 or later), if you use any allow from domain or -deny from domain directives then you will pay for a +However (1.3 or later), if you use any Allow from domain or +Deny from domain directives then you will pay for a double reverse DNS lookup (a reverse, followed by a forward to make sure that the reverse is not being spoofed). So for the highest performance avoid using these directives (it's fine to use IP addresses rather than diff --git a/docs/manual/misc/security_tips.html b/docs/manual/misc/security_tips.html index d0961d9cf9..964d7d89bf 100644 --- a/docs/manual/misc/security_tips.html +++ b/docs/manual/misc/security_tips.html @@ -131,7 +131,7 @@ In the server configuration file, put <Directory />
AllowOverride None
Options None
-allow from all
+Allow from all
</Directory>
@@ -164,7 +164,7 @@ around this, add the following block to your server's configuration: 

  <Directory />
-     Order deny,allow
+     Order Deny,Allow
      Deny from all
  </Directory>
@@ -179,11 +179,11 @@ in those areas you wish. For example, 

  <Directory /usr/users/*/public_html>
-     Order deny,allow
+     Order Deny,Allow
      Allow from all
  </Directory>
  <Directory /usr/local/httpd>
-     Order deny,allow
+     Order Deny,Allow
      Allow from all
  </Directory>
diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html index 3588077c92..0d96648bc0 100644 --- a/docs/manual/mod/core.html +++ b/docs/manual/mod/core.html @@ -70,7 +70,7 @@ always available.
  • Options
  • PidFile
  • Port -
  • require +
  • Require
  • ResourceConfig
  • RLimitCPU
  • RLimitMEM @@ -253,7 +253,7 @@ Allow use of the authorization directives AuthGroupFile, AuthName, AuthType, AuthUserFile, -require, etc.). +Require, etc.).
    FileInfo
    @@ -282,7 +282,7 @@ Allow use of the directives controlling directory indexing
    Limit
    -Allow use of the directives controlling host access (allow, deny and order). +Allow use of the directives controlling host access (Allow, Deny and Order).
    Options
    @@ -315,7 +315,7 @@ This realm is given to the client so that the user knows which username and password to send. AuthName takes a single argument; if the realm name contains spaces, it must be enclosed in quotation marks. It must be accompanied by AuthType and -require directives, and directives such as +Require directives, and directives such as AuthUserFile and AuthGroupFile to work.

    @@ -342,7 +342,7 @@ This directive selects the type of user authentication for a directory. Only Basic and Digest are currently implemented. It must be accompanied by AuthName and -require directives, and directives such as +Require directives, and directives such as AuthUserFile and AuthGroupFile to work.

    @@ -1378,7 +1378,7 @@ PUT, and DELETE, leaving all other methods unprotected:
    <Limit POST PUT DELETE>
    -require valid-user
    +Require valid-user
    </Limit>
    The method names listed can be one or more of: GET, POST, PUT, DELETE, @@ -1780,9 +1780,9 @@ from browsers at foo.com, you might use: 
         <Location /status>
     SetHandler server-status
-    order deny,allow
-    deny from all
-    allow from .foo.com
+    Order Deny,Allow
+    Deny from all
+    Allow from .foo.com
     </Location>
    @@ -2418,12 +2418,12 @@ not to set User to root. If you run the server as root whilst handling connections, your site may be open to a major security attack.

    -

    require directive

    - +

    Require directive

    + Syntax: require entity-name entity entity...
    +>Syntax: Require entity-name entity entity...
    This directive selects which authenticated users can access a directory. The allowed syntaxes are:
      -
    • require user userid userid ...

      +

    • Require user userid userid ...

      Only the named users can access the directory.

      -

    • require group group-name group-name ...

      +

    • Require group group-name group-name ...

      Only users in the named groups can access the directory.

      -

    • require valid-user

      +

    • Require valid-user

      All valid users can access the directory.

    @@ -2458,14 +2458,14 @@ AuthType Basic
    AuthName "Restricted Directory"
    AuthUserFile /web/users
    AuthGroupFile /web/groups
    -require group admin
    +Require group admin
    Access controls which are applied in this way are effective for all methods. This is what is normally desired. If you wish to apply access controls only to specific methods, while leaving other methods unprotected, then place -the require statement into a     Require statement into a <Limit> section

    See also Satisfy and mod_access.

    @@ -2667,7 +2667,8 @@ See also RLimitMEM or >Compatibility: Satisfy is only available in Apache 1.2 and later

    -Access policy if both allow and require used. The parameter can be +Access policy if both Allow and Require +used. The parameter can be either 'all' or 'any'. This directive is only useful if access to a particular area is being restricted by both username/password and client host address. In this case the @@ -2678,7 +2679,7 @@ they either pass the host restriction or enter a valid username and password. This can be used to password restrict an area, but to let clients from particular addresses in without prompting for a password.

    -See also require and +See also Require and mod_access.

    diff --git a/docs/manual/mod/directives.html b/docs/manual/mod/directives.html index c89cf84b71..bce69bb607 100644 --- a/docs/manual/mod/directives.html +++ b/docs/manual/mod/directives.html @@ -45,7 +45,7 @@ of the terms used in their descriptions available.
  • AgentLog
  • Alias
  • AliasMatch -
  • allow +
  • Allow
  • AllowCONNECT
  • AllowOverride
  • Anonymous @@ -100,7 +100,7 @@ of the terms used in their descriptions available.
  • DefaultIcon
  • DefaultLanguage
  • DefaultType -
  • deny +
  • Deny
  • <Directory>
  • <DirectoryMatch>
  • DirectoryIndex @@ -161,7 +161,7 @@ of the terms used in their descriptions available.
  • NameVirtualHost
  • NoCache
  • Options -
  • order +
  • Order
  • PassEnv
  • PidFile
  • Port @@ -181,7 +181,7 @@ of the terms used in their descriptions available.
  • RefererIgnore
  • RefererLog
  • RemoveHandler -
  • require +
  • Require
  • ResourceConfig
  • RewriteBase
  • RewriteCond diff --git a/docs/manual/mod/mod_access.html b/docs/manual/mod/mod_access.html index 81c7e8d3db..28ea89f42a 100644 --- a/docs/manual/mod/mod_access.html +++ b/docs/manual/mod/mod_access.html @@ -22,26 +22,26 @@ hostname or IP address.

    See also Satisfy - and require. + and Require.
    -

    allow directive

    +

    Allow directive

    - + Syntax: allow from host host ...
    +>Syntax: Allow from host host ...
    Module: mod_access

    -The allow directive affects which hosts can access a given directory. +The Allow directive affects which hosts can access a given directory. Host is one of the following:

    @@ -82,7 +82,7 @@ The allow directive affects which hosts can access a given directory.

    Example:

    -
    allow from .ncsa.uiuc.edu
    +
    Allow from .ncsa.uiuc.edu

    All hosts in the specified domain are allowed access.

    @@ -91,12 +91,12 @@ Note that this compares whole components; bar.edu would not match foobar.edu.

    -See also deny, order, and +See also Deny, Order, and BrowserMatch.

    -Syntax: allow from +Syntax: Allow from env=variablename
    deny, order, and >Compatibility: Apache 1.2 and above

    -The allow from env directive controls access to a directory by the +The Allow from env directive controls access to a directory by the existence (or non-existence) of an environment variable.

    @@ -129,26 +129,26 @@ Example: 

     BrowserMatch ^KnockKnock/2.0 let_me_in
 <Directory /docroot>
-    order deny,allow
-    deny from all
-    allow from env=let_me_in
+    Order Deny,Allow
+    Deny from all
+    Allow from env=let_me_in
 </Directory>
    In this case browsers with the user-agent string KnockKnock/2.0 will be allowed access, and all others will be denied.

    -See also deny from env -and order. +See also Deny from env +and Order.

    -

    deny directive

    +

    Deny directive

    - + Syntax: deny from host host ...
    +>Syntax: Deny from host host ...
    order. >Module: mod_access

    -The deny directive affects which hosts can access a given directory. +The Deny directive affects which hosts can access a given directory. Host is one of the following:

    @@ -189,7 +189,7 @@ The deny directive affects which hosts can access a given directory.

    Example:

    -
    deny from 16
    +
    Deny from 16

    All hosts in the specified network are denied access.

    @@ -198,11 +198,11 @@ Note that this compares whole components; bar.edu would not match foobar.edu.

    -See also allow and order. +See also Allow and Order.

    -Syntax: deny from +Syntax: Deny from env=variablename
    allow and order. >Compatibility: Apache 1.2 and above

    -The deny from env directive controls access to a directory by the +The Deny from env directive controls access to a directory by the existence (or non-existence) of an environment variable.

    @@ -235,31 +235,31 @@ Example: 

     BrowserMatch ^BadRobot/0.9 go_away
 <Directory /docroot>
-    order allow,deny
-    allow from all
-    deny from env=go_away
+    Order Allow,Deny
+    Allow from all
+    Deny from env=go_away
 </Directory>
    In this case browsers with the user-agent string BadRobot/0.9 will be denied access, and all others will be allowed.

    -See also allow from env -and order. +See also Allow from env +and Order.

    -

    order directive

    +

    Order directive

    - + Syntax: order ordering
    +>Syntax: Order ordering
    Default: order deny,allow
    +>Default: Order Deny,Allow
    order. >Module: mod_access

    -The order directive controls the order in which allow and -deny directives are evaluated. Ordering is one +The Order directive controls the order in which +Allow and Deny directives are +evaluated. Ordering is one of

    -
    deny,allow -
    the deny directives are evaluated before the allow directives. (The -initial state is OK.) -
    allow,deny -
    the allow directives are evaluated before the deny directives. (The -initial state is FORBIDDEN.) -
    mutual-failure -
    Only those hosts which appear on the allow list and do not appear -on the deny list are granted access. (The initial state is irrelevant.) +
    Deny,Allow +
    the Deny directives are evaluated before the Allow +directives. (The initial state is OK.) +
    Allow,Deny +
    the Allow directives are evaluated before the Deny +directives. (The initial state is FORBIDDEN.) +
    Mutual-failure +
    Only those hosts which appear on the Allow list and do not +appear on the Deny list are granted access. (The initial state is +irrelevant.)

    Keywords may only be separated by a comma; no whitespace is allowed between them. -Note that in all cases every allow and deny +Note that in all cases every Allow and Deny statement is evaluated, there is no "short-circuiting".

    Example:

    - order deny,allow
    - deny from all
    - allow from .ncsa.uiuc.edu
    + Order Deny,Allow
    + Deny from all
    + Allow from .ncsa.uiuc.edu

    Hosts in the ncsa.uiuc.edu domain are allowed access; all other hosts are diff --git a/docs/manual/mod/mod_auth.html b/docs/manual/mod/mod_auth.html index a3f85d54be..9d408ab1aa 100644 --- a/docs/manual/mod/mod_auth.html +++ b/docs/manual/mod/mod_auth.html @@ -165,7 +165,7 @@ and a failure will give an Authorization Required reply.

    So if a userID appears in the database of more than one module; or if -a valid require directive applies to more than one module; then the +a valid Require directive applies to more than one module; then the first module will verify the credentials; and no access is passed on; regardless of the AuthAuthoritative setting. diff --git a/docs/manual/mod/mod_auth_anon.html b/docs/manual/mod/mod_auth_anon.html index b4708cb95d..a9f9ae1512 100644 --- a/docs/manual/mod/mod_auth_anon.html +++ b/docs/manual/mod/mod_auth_anon.html @@ -299,10 +299,10 @@ AuthType basic # Anonymous_Authoritative for public access.
    # In the .htaccess for the public directory, add:
    <Files *>
    -order deny,allow
    -allow from all
    +Order Deny,Allow
    +Allow from all

    -require valid-user
    +Require valid-user
    </Files>
    diff --git a/docs/manual/mod/mod_auth_db.html b/docs/manual/mod/mod_auth_db.html index 2df31ba261..8b6aeeb2ca 100644 --- a/docs/manual/mod/mod_auth_db.html +++ b/docs/manual/mod/mod_auth_db.html @@ -185,7 +185,7 @@ and/or rule specified; the usual password and access checks will be applied and a failure will give an Authorization Required reply.

    So if a userID appears in the database of more than one module; or -if a valid require directive applies to more than one module; then +if a valid Require directive applies to more than one module; then the first module will verify the credentials; and no access is passed on; regardless of the AuthAuthoritative setting.

    diff --git a/docs/manual/mod/mod_auth_dbm.html b/docs/manual/mod/mod_auth_dbm.html index 36218ef8ee..260f243caf 100644 --- a/docs/manual/mod/mod_auth_dbm.html +++ b/docs/manual/mod/mod_auth_dbm.html @@ -175,7 +175,7 @@ and/or rule specified; the usual password and access checks will be applied and a failure will give an Authorization Required reply.

    So if a userID appears in the database of more than one module; or -if a valid require directive applies to more than one module; then +if a valid Require directive applies to more than one module; then the first module will verify the credentials; and no access is passed on; regardless of the AuthAuthoritative setting.

    diff --git a/docs/manual/mod/mod_auth_digest.html b/docs/manual/mod/mod_auth_digest.html index 97fc96f1b4..447fcfea0e 100644 --- a/docs/manual/mod/mod_auth_digest.html +++ b/docs/manual/mod/mod_auth_digest.html @@ -396,7 +396,7 @@ this protection space. Example: AuthName "private area" AuthDigestDomain /private/ http://mirror.my.dom/private2/ AuthDigestFile /web/auth/.digest_pw - require valid-user + Require valid-user </Location> diff --git a/docs/manual/mod/mod_proxy.html b/docs/manual/mod/mod_proxy.html index 6e9db4fdd9..e7ec704d1a 100644 --- a/docs/manual/mod/mod_proxy.html +++ b/docs/manual/mod/mod_proxy.html @@ -1081,9 +1081,9 @@ control block using the following example:

     <Directory proxy:*>
-order deny,allow
-deny from [machines you'd like *not* to allow by IP address or name]
-allow from [machines you'd like to allow by IP address or name]
+Order Deny,Allow
+Deny from [machines you'd like *not* to allow by IP address or name]
+Allow from [machines you'd like to allow by IP address or name]
 </Directory>

    diff --git a/docs/manual/mod/mod_status.html b/docs/manual/mod/mod_status.html index ccfabe1a83..f85943374e 100644 --- a/docs/manual/mod/mod_status.html +++ b/docs/manual/mod/mod_status.html @@ -93,9 +93,9 @@ domain add this code to your access.conf configuration file <Location /server-status> SetHandler server-status - order deny,allow - deny from all - allow from .foo.com + Order Deny,Allow + Deny from all + Allow from .foo.com </Location>

    diff --git a/docs/manual/platform/readme-tpf.html b/docs/manual/platform/readme-tpf.html index 9d1a82a279..2b3c0e2cdc 100644 --- a/docs/manual/platform/readme-tpf.html +++ b/docs/manual/platform/readme-tpf.html @@ -129,7 +129,7 @@ Notes:

      -
    1. Use of mod_access directives "allow from" & "deny from" +
    2. Use of mod_access directives "Allow from" & "Deny from" with host names (verses ip addresses) requires TPF version 4.1 PUT10
    3. CGI execution requires TPF version 4.1 PUT10
    diff --git a/docs/manual/vhosts/examples.html b/docs/manual/vhosts/examples.html index 46697bcec4..a59d15ed53 100644 --- a/docs/manual/vhosts/examples.html +++ b/docs/manual/vhosts/examples.html @@ -128,9 +128,9 @@ ServerName www-cache.domain.tld ... <Directory proxy:> - order deny,allow - deny from all - allow from 111.22.33 + Order Deny,Allow + Deny from all + Allow from 111.22.33 </Directory> </VirtualHost> diff --git a/docs/manual/vhosts/host.html b/docs/manual/vhosts/host.html index 5788676af8..248092467b 100644 --- a/docs/manual/vhosts/host.html +++ b/docs/manual/vhosts/host.html @@ -123,7 +123,7 @@ access to www.foo.com to get private.foo.com header. It is important to note that this condition exists only if you only implement this policy at the IP layer - all security controls used by Apache (i.e., allow, deny from, etc.) are +HREF="../mod/mod_access.html">Allow, Deny from, etc.) are consistently respected.

    Compatibility with Older Browsers

    -- 2.50.1