From: Rich Bowen Date: Wed, 16 Feb 2011 12:19:59 +0000 (+0000) Subject: Removes more instances of 'allow from' and 'deny from' syntax. I think X-Git-Tag: 2.3.11~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e2a21904b0a651d120b53d78689e7ed105e6c55;p=apache Removes more instances of 'allow from' and 'deny from' syntax. I think that's the last of them. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1071221 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index d012303757..0c7ad073c9 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -735,7 +735,7 @@ named file-system directory, sub-directories, and their contents. be applied.

Note that the default access for - <Directory /> is Allow from All. + <Directory /> is to permit all access. This means that Apache httpd will serve any file mapped from an URL. It is recommended that you change this with a block such as

@@ -743,8 +743,7 @@ named file-system directory, sub-directories, and their contents.

<Directory />
- Order Deny,Allow
- Deny from All
+ Require all denied
 </Directory>

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index d5f114b194..a3c7d2dec0 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -682,7 +682,7 @@ named file-system directory, sub-directories, and their contents. be applied.

Note that the default access for - <Directory /> is Allow from All. + <Directory /> is to permit all access. This means that Apache httpd will serve any file mapped from an URL. It is recommended that you change this with a block such as

@@ -690,8 +690,7 @@ named file-system directory, sub-directories, and their contents. <Directory />
- Order Deny,Allow
- Deny from All
+ Require all denied
 </Directory> diff --git a/docs/manual/mod/mod_authn_anon.html.en b/docs/manual/mod/mod_authn_anon.html.en index 394aaf1d8e..fde11d7ea3 100644 --- a/docs/manual/mod/mod_authn_anon.html.en +++ b/docs/manual/mod/mod_authn_anon.html.en @@ -104,8 +104,7 @@ Anonymous_LogEmail on
Anonymous anonymous guest www test welcome

- Order Deny,Allow
- Allow from all
+ Require all granted

Require valid-user
diff --git a/docs/manual/mod/mod_authn_anon.xml b/docs/manual/mod/mod_authn_anon.xml index 2f782f0d3b..57696d7b2c 100644 --- a/docs/manual/mod/mod_authn_anon.xml +++ b/docs/manual/mod/mod_authn_anon.xml @@ -94,8 +94,7 @@ Anonymous_LogEmail on
Anonymous anonymous guest www test welcome

- Order Deny,Allow
- Allow from all
+ Require all granted

Require valid-user
diff --git a/docs/manual/mod/mod_authz_core.html.en b/docs/manual/mod/mod_authz_core.html.en index 3364b292dd..d63eba9aa3 100644 --- a/docs/manual/mod/mod_authz_core.html.en +++ b/docs/manual/mod/mod_authz_core.html.en @@ -95,8 +95,7 @@ Alias /secure /webpages/secure
<Directory /webpages/secure>
- Order deny,allow
- Allow from all

+ Require all granted

AuthBasicProvider file

diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en index e156891d87..1cd14b414c 100644 --- a/docs/manual/mod/mod_ldap.html.en +++ b/docs/manual/mod/mod_ldap.html.en @@ -104,9 +104,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ Satisfy any
AuthType Basic
AuthName "LDAP Protected"
@@ -247,9 +247,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ Satisfy any
AuthType Basic
AuthName "LDAP Protected"
@@ -270,9 +270,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ Satisfy any
AuthType Basic
AuthName "LDAP Protected"
@@ -324,9 +324,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ Satisfy any
AuthType Basic
AuthName "LDAP Protected"
@@ -395,9 +395,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem
LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem
# CA certs respecified due to per-directory client certs
diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index e64bce3a70..dee8c745d0 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -76,9 +76,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ Satisfy any
AuthType Basic
AuthName "LDAP Protected"
@@ -221,9 +221,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ Satisfy any
AuthType Basic
AuthName "LDAP Protected"
@@ -244,9 +244,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ Satisfy any
AuthType Basic
AuthName "LDAP Protected"
@@ -298,9 +298,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ Satisfy any
AuthType Basic
AuthName "LDAP Protected"
@@ -369,9 +369,9 @@ by other LDAP modules <Location /ldap-status>
SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from yourdomain.example.com
+ + Require host yourdomain.example.com
+ LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem
LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem
# CA certs respecified due to per-directory client certs