From 1f6696f2f7e7dba951ebffc4ce9debac02b0b47c Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Thu, 4 Nov 2010 17:12:35 +0000 Subject: [PATCH] Change mentions of 'Deny from' and 'Allow from' to new Require syntax. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031084 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/core.html.en | 4 +--- docs/manual/mod/core.xml | 4 +--- docs/manual/mod/mod_alias.html.en | 3 +-- docs/manual/mod/mod_alias.xml | 3 +-- docs/manual/mod/mod_dav.html.en | 3 +-- docs/manual/mod/mod_dav.xml | 3 +-- docs/manual/mod/mod_info.html.en | 4 +--- docs/manual/mod/mod_info.xml | 4 +--- docs/manual/mod/mod_proxy.html.en | 12 +++--------- docs/manual/mod/mod_proxy.xml | 12 +++--------- docs/manual/mod/mod_proxy_balancer.html.en | 4 +--- docs/manual/mod/mod_proxy_balancer.xml | 4 +--- docs/manual/mod/mod_status.html.en | 4 +--- docs/manual/mod/mod_status.xml | 4 +--- 14 files changed, 18 insertions(+), 50 deletions(-) diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 53e4c58149f..d4393e6c82b 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -2281,9 +2281,7 @@ URLs <Location /status>
SetHandler server-status
- Order Deny,Allow
- Deny from all
- Allow from .example.com
+ Require host example.com
 </Location>

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index e713791a846..7947efb252d 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -2282,9 +2282,7 @@ URLs <Location /status>
SetHandler server-status
- Order Deny,Allow
- Deny from all
- Allow from .example.com
+ Require host example.com
 </Location> diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en index 39e08574cae..a29aa261bc1 100644 --- a/docs/manual/mod/mod_alias.html.en +++ b/docs/manual/mod/mod_alias.html.en @@ -158,8 +158,7 @@ Alias /image /ftp/pub/image
<Directory /ftp/pub/image>
- Order allow,deny
- Allow from all
+ Require all granted
 </Directory>

diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml index 48ea9eebcb1..513367504bf 100644 --- a/docs/manual/mod/mod_alias.xml +++ b/docs/manual/mod/mod_alias.xml @@ -147,8 +147,7 @@ href="../urlmapping.html">Mapping URLs to the filesystem Alias /image /ftp/pub/image
<Directory /ftp/pub/image>
- Order allow,deny
- Allow from all
+ Require all granted
 </Directory> diff --git a/docs/manual/mod/mod_dav.html.en b/docs/manual/mod/mod_dav.html.en index 324be9c0ca5..8ddccab3ce1 100644 --- a/docs/manual/mod/mod_dav.html.en +++ b/docs/manual/mod/mod_dav.html.en @@ -94,8 +94,7 @@
<Directory /usr/local/apache2/htdocs/foo>
- Order Allow,Deny
- Allow from all
+ Require all granted
Dav On

AuthType Basic
diff --git a/docs/manual/mod/mod_dav.xml b/docs/manual/mod/mod_dav.xml index 06bd77eb280..b598ba30567 100644 --- a/docs/manual/mod/mod_dav.xml +++ b/docs/manual/mod/mod_dav.xml @@ -81,8 +81,7 @@
<Directory /usr/local/apache2/htdocs/foo>
- Order Allow,Deny
- Allow from all
+ Require all granted
Dav On

AuthType Basic
diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en index 4936263e710..ce96d2bbf46 100644 --- a/docs/manual/mod/mod_info.html.en +++ b/docs/manual/mod/mod_info.html.en @@ -53,9 +53,7 @@ configuration <Location /server-info>
SetHandler server-info
- Order deny,allow
- Deny from all
- Allow from yourcompany.com
+ Require host yourcompany.com
 </Location>

diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index 2fd7c64a21e..fea553bac70 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -50,9 +50,7 @@ configuration <Location /server-info>
SetHandler server-info
- Order deny,allow
- Deny from all
- Allow from yourcompany.com
+ Require host yourcompany.com
 </Location> diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 81c34adc110..852428d9a5d 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -179,9 +179,7 @@
<Proxy *>
- Order deny,allow
- Deny from all
- Allow from internal.example.com
+ Require host internal.example.com
 </Proxy>

@@ -309,9 +307,7 @@

<Proxy *>
- Order Deny,Allow
- Deny from all
- Allow from 192.168.0
+ Require ip 192.168.0
 </Proxy>

@@ -600,9 +596,7 @@ directly

<Proxy *>
- Order Deny,Allow
- Deny from all
- Allow from yournetwork.example.com
+ Require host yournetwork.example.com
 </Proxy>

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index fc5dfeb7ba1..cc4a896d850 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -139,9 +139,7 @@
<Proxy *>
- Order deny,allow
- Deny from all
- Allow from internal.example.com
+ Require host internal.example.com
 </Proxy> @@ -271,9 +269,7 @@ <Proxy *>
- Order Deny,Allow
- Deny from all
- Allow from 192.168.0
+ Require ip 192.168.0
 </Proxy> @@ -425,9 +421,7 @@ <Proxy *>
- Order Deny,Allow
- Deny from all
- Allow from yournetwork.example.com
+ Require host yournetwork.example.com
 </Proxy> diff --git a/docs/manual/mod/mod_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en index c56bc3d7689..aca16fb73e4 100644 --- a/docs/manual/mod/mod_proxy_balancer.html.en +++ b/docs/manual/mod/mod_proxy_balancer.html.en @@ -204,9 +204,7 @@ <Location /balancer-manager>
SetHandler balancer-manager

- Order Deny,Allow
- Deny from all
- Allow from .example.com
+ Require host example.com
</Location>

diff --git a/docs/manual/mod/mod_proxy_balancer.xml b/docs/manual/mod/mod_proxy_balancer.xml index 4ef91aa735a..fb1ee78b008 100644 --- a/docs/manual/mod/mod_proxy_balancer.xml +++ b/docs/manual/mod/mod_proxy_balancer.xml @@ -188,9 +188,7 @@ <Location /balancer-manager>
SetHandler balancer-manager

- Order Deny,Allow
- Deny from all
- Allow from .example.com
+ Require host example.com
</Location> diff --git a/docs/manual/mod/mod_status.html.en b/docs/manual/mod/mod_status.html.en index 1f8ece9edc6..eec9f6f2682 100644 --- a/docs/manual/mod/mod_status.html.en +++ b/docs/manual/mod/mod_status.html.en @@ -94,9 +94,7 @@ performance <Location /server-status>
SetHandler server-status

- Order Deny,Allow
- Deny from all
- Allow from .example.com
+ Require host example.com
</Location>

diff --git a/docs/manual/mod/mod_status.xml b/docs/manual/mod/mod_status.xml index e834f517ba9..75614562e19 100644 --- a/docs/manual/mod/mod_status.xml +++ b/docs/manual/mod/mod_status.xml @@ -81,9 +81,7 @@ performance <Location /server-status>
SetHandler server-status

- Order Deny,Allow
- Deny from all
- Allow from .example.com
+ Require host example.com
</Location> -- 2.47.2