Use Require instead of Allow and Deny.

While at it, removes the "based on the value of" because, it is not really based on the value of the environment variable, but on its existence or not.

PR 65048

(r1885046 on trunk)

While at it, remove some trailing spaces and add some "" to improve syntax color highlighting.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1885047 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/env.xml b/docs/manual/env.xml
index d4375cf6888cd617d669e8be2291973cbba3021b..154f88ad1e67a3c51b7ca7f559ca69e91010677a 100644 (file)
--- a/docs/manual/env.xml
+++ b/docs/manual/env.xml
@@ -153,10 +153,10 @@
           <directive module="mod_setenvif">SetEnvIf</directive> and <directive
           module="mod_rewrite">RewriteCond</directive> will not see the
           variables set with it.</li>
- 
-          <li>When the server looks up a path via an internal 
-          <glossary ref="subrequest">subrequest</glossary> such as looking 
-          for a <directive module="mod_dir" >DirectoryIndex</directive> 
+
+          <li>When the server looks up a path via an internal
+          <glossary ref="subrequest">subrequest</glossary> such as looking
+          for a <directive module="mod_dir" >DirectoryIndex</directive>
           or generating a directory listing with <module>mod_autoindex</module>,
           per-request environment variables are <em>not</em> inherited in the 
           subrequest. Additionally, 
@@ -182,6 +182,7 @@
       <directivelist>
         <directive module="mod_authz_core">Require</directive>
         <directive module="mod_log_config">CustomLog</directive>
+        <directive module="mod_access_compat">Allow</directive>
         <directive module="mod_access_compat">Deny</directive>
         <directive module="mod_ext_filter">ExtFilterDefine</directive>
         <directive module="mod_headers">Header</directive>
@@ -219,9 +220,9 @@
     <section id="access-control">
         <title>Access Control</title>
 
-        <p>Access to the server can be controlled based on the value of
-        environment variables using the <code>allow from env=</code>
-        and <code>deny from env=</code> directives. In combination with
+        <p>Access to the server can be controlled based on
+        environment variables using the <code>Require env</code>
+        and <code>Require not env</code> directives. In combination with
         <directive module="mod_setenvif">SetEnvIf</directive>, this
         allows for flexible control of access to the server based on
         characteristics of the client. For example, you can use these
@@ -457,7 +458,7 @@
       these headers:</p>
 
 <highlight language="config">
-# 
+#
 # The following works around a client sending a broken Accept_Encoding
 # header.
 #
@@ -509,7 +510,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 SetEnvIf Request_URI \.gif image-request
 SetEnvIf Request_URI \.jpg image-request
 SetEnvIf Request_URI \.png image-request
-CustomLog logs/access_log common env=!image-request
+CustomLog "logs/access_log" common env=!image-request
         </highlight>
 
     </section>