Merge r1543907 from trunk:

doc behavior change in r821333, CacheEnable foo / does not apply to forward
proxy.

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

diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml
index 809215f1389dc4519b0bb31557aca1ebaa115569..a0561cb4c094c741179f9cf96e109be1805f69da 100644 (file)
--- a/docs/manual/mod/mod_cache.xml
+++ b/docs/manual/mod/mod_cache.xml
@@ -345,6 +345,8 @@ manager</description>
 <syntax>CacheEnable <var>cache_type</var> [<var>url-string</var>]</syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context>
+<compatibility>A url-string of '/' applied to forward proxy content in 2.2 and
+ earlier.</compatibility>
 </contextlist>
 
 <usage>
@@ -372,9 +374,8 @@ manager</description>
     <directive type="section">LocationMatch</directive> sections are processed
     before globally defined <directive>CacheEnable</directive> directives.</p>
 
-    <p>When acting as a forward proxy server, <var>url-string</var> can
-    also be used to specify remote sites and proxy protocols which
-    caching should be enabled for.</p>
+    <p>When acting as a forward proxy server, <var>url-string</var> must 
+    minimally begin with a protocol for which caching should be enabled.</p>
 
     <highlight language="config">
 # Cache content (normal handler only)
@@ -389,13 +390,13 @@ CacheQuickHandler off
     CacheEnable disk
 &lt;/LocationMatch&gt;
 
-# Cache proxied url's (normal or quick handler)
+# Cache all but forward proxy url's (normal or quick handler)
 CacheEnable  disk  /
 
 # Cache FTP-proxied url's (normal or quick handler)
 CacheEnable  disk  ftp://
 
-# Cache content from www.example.org (normal or quick handler)
+# Cache forward proxy content from www.example.org (normal or quick handler)
 CacheEnable  disk  http://www.example.org/
     </highlight>
 

diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index 01ae445f3567a95b5a453156dc7c117631e00410..482b258da3045688b71a2c644524ecee537bcccd 100644 (file)
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -256,6 +256,12 @@ Allow from example.org
         <code>jsessionid</code>.
         </li>
 
+        <li><module>mod_cache</module>: The second parameter to 
+        <directive module="mod_cache">CacheEnable</directive> only
+        matches forward proxy content if it begins with the correct
+        protocol. In 2.2 and earlier, a parameter of '/' matched all
+        content.</li>
+
         <li><module>mod_ldap</module>: <directive
         module="mod_ldap">LDAPTrustedClientCert</directive> is now
         consistently a per-directory setting only.  If you use this