From: Takashi Sato <takashi@apache.org>
Date: Fri, 23 May 2014 12:47:50 +0000 (+0000)
Subject: Merge r1516872, 1542353 and 1580895 from trunk:
X-Git-Tag: 2.4.10~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f779d4cc43a4b60c4e83130f489cafe8515b5ac;p=apache

Merge r1516872, 1542353 and 1580895 from trunk:
  howto/index.xml:
    CGI is no longer the most common way to provide dynamic content, is it?
  howto/access.xml:
    Suggest the 'require expr' syntax as an alternate way to do something.
  caching.xml:
    elaborate on the early/late vs "Authorization" header (vs. other forms of
    authorization)


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

diff --git a/docs/manual/caching.xml b/docs/manual/caching.xml
index 5fc8ab9616..f08ed7a77f 100644
--- a/docs/manual/caching.xml
+++ b/docs/manual/caching.xml
@@ -185,6 +185,10 @@
               server processing is bypassed. This mode however also bypasses the
               authentication and authorization phases of server processing, so
               this mode should be chosen with care when this is important.</p>
+  
+              <p> Requests with an "Authorization" header (for example, HTTP Basic
+              Authentication) are neither cacheable nor served from the cache 
+              when <module>mod_cache</module> is running in this phase.</p>
           </dd>
           <dt>Normal handler phase</dt>
           <dd>
diff --git a/docs/manual/howto/access.xml b/docs/manual/howto/access.xml
index a4443ca38e..40f054dbff 100644
--- a/docs/manual/howto/access.xml
+++ b/docs/manual/howto/access.xml
@@ -138,6 +138,14 @@ Require not host gov
 &lt;/If&gt;
     </highlight>
 
+    <p>Using the <directive module="mod_authz_core">Require</directive>
+    <code>expr</code> syntax, this could also be written as:</p>
+
+
+    <highlight language="config">
+Require expr %{HTTP_USER_AGENT} != 'BadBot'
+    </highlight>
+
     <note><title>Warning:</title>
     <p>Access control by <code>User-Agent</code> is an unreliable technique,
     since the <code>User-Agent</code> header can be set to anything at all,
diff --git a/docs/manual/howto/index.xml b/docs/manual/howto/index.xml
index d7d79b4977..7f9636266a 100644
--- a/docs/manual/howto/index.xml
+++ b/docs/manual/howto/index.xml
@@ -59,7 +59,7 @@
         <p>The CGI (Common Gateway Interface) defines a way for a web
         server to interact with external content-generating programs,
         which are often referred to as CGI programs or CGI scripts. It
-        is the simplest, and most common, way to put dynamic content on
+        is a simple way to put dynamic content on
         your web site. This document will be an introduction to setting
         up CGI on your Apache web server, and getting started writing
         CGI programs.</p>