summaryrefslogtreecommitdiffstats
path: root/docs/manual
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2013-11-20 20:04:48 +0100
committerEric Covener <covener@apache.org>2013-11-20 20:04:48 +0100
commit71b655f4389c8d85a52537871ca63b794447dd29 (patch)
treee452c7c1b70f3fdea7ab1f4f3b2cc26631cf4db8 /docs/manual
parentdoc behavior change in r821333, CacheEnable foo / does not apply to forward (diff)
downloadapache2-71b655f4389c8d85a52537871ca63b794447dd29.tar.xz
apache2-71b655f4389c8d85a52537871ca63b794447dd29.zip
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1543908 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
-rw-r--r--docs/manual/mod/mod_cache.html.en9
-rw-r--r--docs/manual/upgrading.html.en6
-rw-r--r--docs/manual/upgrading.xml.meta2
3 files changed, 11 insertions, 6 deletions
diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en
index a3395d7bb6..2affdabe4c 100644
--- a/docs/manual/mod/mod_cache.html.en
+++ b/docs/manual/mod/mod_cache.html.en
@@ -493,9 +493,8 @@ manager</td></tr>
<code class="directive">&lt;LocationMatch&gt;</code> sections are processed
before globally defined <code class="directive">CacheEnable</code> 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>
<pre class="prettyprint lang-config">
# Cache content (normal handler only)
@@ -510,13 +509,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/
</pre>
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index 6bc4aca785..5b16f53193 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -239,6 +239,12 @@ Allow from example.org
<code>jsessionid</code>.
</li>
+ <li><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code>: The second parameter to
+ <code class="directive"><a href="./mod/mod_cache.html#cacheenable">CacheEnable</a></code> 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><code class="module"><a href="./mod/mod_ldap.html">mod_ldap</a></code>: <code class="directive"><a href="./mod/mod_ldap.html#ldaptrustedclientcert">LDAPTrustedClientCert</a></code> is now
consistently a per-directory setting only. If you use this
directive, review your configuration to make sure it is
diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index 1d2a68a225..aba29996bb 100644
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
</variants>
</metafile>