diff options
| author | Rich Bowen <rbowen@apache.org> | 2011-02-16 13:19:59 +0100 |
|---|---|---|
| committer | Rich Bowen <rbowen@apache.org> | 2011-02-16 13:19:59 +0100 |
| commit | 1e2a21904b0a651d120b53d78689e7ed105e6c55 (patch) | |
| tree | 62acd12db2aa98cb092fbf2437b2f7bcef67fe78 /docs | |
| parent | Removes another instance of the "Allow from all" syntax. (diff) | |
| download | apache2-1e2a21904b0a651d120b53d78689e7ed105e6c55.tar.xz apache2-1e2a21904b0a651d120b53d78689e7ed105e6c55.zip | |
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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manual/mod/core.html.en | 5 | ||||
| -rw-r--r-- | docs/manual/mod/core.xml | 5 | ||||
| -rw-r--r-- | docs/manual/mod/mod_authn_anon.html.en | 3 | ||||
| -rw-r--r-- | docs/manual/mod/mod_authn_anon.xml | 3 | ||||
| -rw-r--r-- | docs/manual/mod/mod_authz_core.html.en | 3 | ||||
| -rw-r--r-- | docs/manual/mod/mod_ldap.html.en | 30 | ||||
| -rw-r--r-- | docs/manual/mod/mod_ldap.xml | 30 |
7 files changed, 37 insertions, 42 deletions
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.</td></tr> be applied.</p> <p><strong>Note that the default access for - <code><Directory /></code> is <code>Allow from All</code>. + <code><Directory /></code> 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</strong></p> @@ -743,8 +743,7 @@ named file-system directory, sub-directories, and their contents.</td></tr> <div class="example"><p><code> <Directory /><br /> <span class="indent"> - Order Deny,Allow<br /> - Deny from All<br /> + Require all denied<br /> </span> </Directory> </code></p></div> 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.</description> be applied.</p> <p><strong>Note that the default access for - <code><Directory /></code> is <code>Allow from All</code>. + <code><Directory /></code> 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</strong></p> @@ -690,8 +690,7 @@ named file-system directory, sub-directories, and their contents.</description> <example> <Directory /><br /> <indent> - Order Deny,Allow<br /> - Deny from All<br /> + Require all denied<br /> </indent> </Directory> </example> 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<br /> Anonymous anonymous guest www test welcome<br /> <br /> - Order Deny,Allow<br /> - Allow from all<br /> + Require all granted<br /> <br /> Require valid-user<br /> </span> 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<br /> Anonymous anonymous guest www test welcome<br /> <br /> - Order Deny,Allow<br /> - Allow from all<br /> + Require all granted<br /> <br /> Require valid-user<br /> </indent> 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<br /> <Directory /webpages/secure><br /> <span class="indent"> - Order deny,allow<br /> - Allow from all<br /><br /> + Require all granted<br /><br /> AuthBasicProvider file<br /><br /> 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</td></tr> <Location /ldap-status><br /> <span class="indent"> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + Satisfy any<br /> AuthType Basic<br /> AuthName "LDAP Protected"<br /> @@ -247,9 +247,9 @@ by other LDAP modules</td></tr> <Location /ldap-status><br /> <span class="indent"> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + Satisfy any<br /> AuthType Basic<br /> AuthName "LDAP Protected"<br /> @@ -270,9 +270,9 @@ by other LDAP modules</td></tr> <Location /ldap-status><br /> <span class="indent"> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + Satisfy any<br /> AuthType Basic<br /> AuthName "LDAP Protected"<br /> @@ -324,9 +324,9 @@ by other LDAP modules</td></tr> <Location /ldap-status><br /> <span class="indent"> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + Satisfy any<br /> AuthType Basic<br /> AuthName "LDAP Protected"<br /> @@ -395,9 +395,9 @@ by other LDAP modules</td></tr> <Location /ldap-status><br /> <span class="indent"> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem<br /> LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem<br /> # CA certs respecified due to per-directory client certs<br /> 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</description> <Location /ldap-status><br /> <indent> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + Satisfy any<br /> AuthType Basic<br /> AuthName "LDAP Protected"<br /> @@ -221,9 +221,9 @@ by other LDAP modules</description> <Location /ldap-status><br /> <indent> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + Satisfy any<br /> AuthType Basic<br /> AuthName "LDAP Protected"<br /> @@ -244,9 +244,9 @@ by other LDAP modules</description> <Location /ldap-status><br /> <indent> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + Satisfy any<br /> AuthType Basic<br /> AuthName "LDAP Protected"<br /> @@ -298,9 +298,9 @@ by other LDAP modules</description> <Location /ldap-status><br /> <indent> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + Satisfy any<br /> AuthType Basic<br /> AuthName "LDAP Protected"<br /> @@ -369,9 +369,9 @@ by other LDAP modules</description> <Location /ldap-status><br /> <indent> SetHandler ldap-status<br /> - Order deny,allow<br /> - Deny from all<br /> - Allow from yourdomain.example.com<br /> + + Require host yourdomain.example.com<br /> + LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem<br /> LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem<br /> # CA certs respecified due to per-directory client certs<br /> |