You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2012/03/26 00:35:19 UTC
svn commit: r1305167 - in /httpd/httpd/trunk/docs/manual: ./ developer/ mod/
Author: minfrin
Date: Sun Mar 25 22:35:18 2012
New Revision: 1305167
URL: http://svn.apache.org/viewvc?rev=1305167&view=rev
Log:
Update transformations.
Added:
httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html
httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html.en
httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml
httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml.meta
Modified:
httpd/httpd/trunk/docs/manual/developer/new_api_2_4.html.en
httpd/httpd/trunk/docs/manual/mod/allmodules.xml
httpd/httpd/trunk/docs/manual/mod/allmodules.xml.de
httpd/httpd/trunk/docs/manual/mod/allmodules.xml.es
httpd/httpd/trunk/docs/manual/mod/allmodules.xml.fr
httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja
httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ko
httpd/httpd/trunk/docs/manual/mod/allmodules.xml.tr
httpd/httpd/trunk/docs/manual/mod/allmodules.xml.zh-cn
httpd/httpd/trunk/docs/manual/mod/core.xml.meta
httpd/httpd/trunk/docs/manual/mod/directives.html.en
httpd/httpd/trunk/docs/manual/mod/index.html.en
httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en
httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko
httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr
httpd/httpd/trunk/docs/manual/mod/mod_cache.html.en
httpd/httpd/trunk/docs/manual/mod/mod_cache.xml
httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.html.en
httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.xml
httpd/httpd/trunk/docs/manual/mod/mod_slotmem_shm.html.en
httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
httpd/httpd/trunk/docs/manual/new_features_2_0.html.en
httpd/httpd/trunk/docs/manual/new_features_2_0.xml.de
httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ja
httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ko
httpd/httpd/trunk/docs/manual/new_features_2_0.xml.meta
httpd/httpd/trunk/docs/manual/new_features_2_0.xml.pt-br
httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ru
httpd/httpd/trunk/docs/manual/new_features_2_0.xml.tr
httpd/httpd/trunk/docs/manual/sitemap.html.en
httpd/httpd/trunk/docs/manual/socache.html.en
httpd/httpd/trunk/docs/manual/socache.xml
httpd/httpd/trunk/docs/manual/upgrading.html.en
Modified: httpd/httpd/trunk/docs/manual/developer/new_api_2_4.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/new_api_2_4.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/new_api_2_4.html.en (original)
+++ httpd/httpd/trunk/docs/manual/developer/new_api_2_4.html.en Sun Mar 25 22:35:18 2012
@@ -70,8 +70,6 @@
<p><code>ap_mpm_run</code> is replaced by a new <code>mpm</code> hook.
Also <code>ap_graceful_stop_signalled</code> is lost, and
<code>ap_mpm_register_timed_callback</code> is new.</p>
- <p><code>ap_mpm_query</code> is not longer available in the register hooks
- phase during startup.</p>
<h3><a name="ap_regex" id="ap_regex">ap_regex (changed)</a></h3>
Modified: httpd/httpd/trunk/docs/manual/mod/allmodules.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/allmodules.xml?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/allmodules.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/allmodules.xml Sun Mar 25 22:35:18 2012
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cache_disk.xml</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/trunk/docs/manual/mod/allmodules.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/allmodules.xml.de?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/allmodules.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/allmodules.xml.de Sun Mar 25 22:35:18 2012
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cache_disk.xml</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/trunk/docs/manual/mod/allmodules.xml.es
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/allmodules.xml.es?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/allmodules.xml.es (original)
+++ httpd/httpd/trunk/docs/manual/mod/allmodules.xml.es Sun Mar 25 22:35:18 2012
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cache_disk.xml</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/trunk/docs/manual/mod/allmodules.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/allmodules.xml.fr?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/allmodules.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/allmodules.xml.fr Sun Mar 25 22:35:18 2012
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml.fr</modulefile>
<modulefile>mod_cache.xml.fr</modulefile>
<modulefile>mod_cache_disk.xml.fr</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ja [utf-8] Sun Mar 25 22:35:18 2012
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml.ja</modulefile>
<modulefile>mod_cache_disk.xml.ja</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml.ja</modulefile>
<modulefile>mod_cgid.xml.ja</modulefile>
Modified: httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ko?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/allmodules.xml.ko [euc-kr] Sun Mar 25 22:35:18 2012
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml.ko</modulefile>
<modulefile>mod_cache_disk.xml.ko</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml.ko</modulefile>
<modulefile>mod_cgi.xml.ko</modulefile>
<modulefile>mod_cgid.xml.ko</modulefile>
Modified: httpd/httpd/trunk/docs/manual/mod/allmodules.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/allmodules.xml.tr?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/allmodules.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/allmodules.xml.tr [utf-8] Sun Mar 25 22:35:18 2012
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cache_disk.xml</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/trunk/docs/manual/mod/allmodules.xml.zh-cn
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/allmodules.xml.zh-cn?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/allmodules.xml.zh-cn (original)
+++ httpd/httpd/trunk/docs/manual/mod/allmodules.xml.zh-cn Sun Mar 25 22:35:18 2012
@@ -29,6 +29,7 @@
<modulefile>mod_buffer.xml</modulefile>
<modulefile>mod_cache.xml</modulefile>
<modulefile>mod_cache_disk.xml</modulefile>
+ <modulefile>mod_cache_socache.xml</modulefile>
<modulefile>mod_cern_meta.xml</modulefile>
<modulefile>mod_cgi.xml</modulefile>
<modulefile>mod_cgid.xml</modulefile>
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.meta?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.meta Sun Mar 25 22:35:18 2012
@@ -10,7 +10,7 @@
<variant outdated="yes">de</variant>
<variant>en</variant>
<variant outdated="yes">es</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">tr</variant>
</variants>
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.en Sun Mar 25 22:35:18 2012
@@ -177,6 +177,12 @@
<li><a href="mod_cache_disk.html#cachereadsize">CacheReadSize</a></li>
<li><a href="mod_cache_disk.html#cachereadtime">CacheReadTime</a></li>
<li><a href="mod_cache_disk.html#cacheroot">CacheRoot</a></li>
+<li><a href="mod_cache_socache.html#cachesocache">CacheSocache</a></li>
+<li><a href="mod_cache_socache.html#cachesocachemaxsize">CacheSocacheMaxSize</a></li>
+<li><a href="mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime</a></li>
+<li><a href="mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime</a></li>
+<li><a href="mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize</a></li>
+<li><a href="mod_cache_socache.html#cachesocachereadtime">CacheSocacheReadTime</a></li>
<li><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError</a></li>
<li><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired</a></li>
<li><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/index.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/index.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/index.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/index.html.en Sun Mar 25 22:35:18 2012
@@ -103,6 +103,8 @@ address)</dd>
<dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support for request buffering</dd>
<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>RFC 2616 compliant HTTP caching filter.</dd>
<dt><a href="mod_cache_disk.html">mod_cache_disk</a></dt><dd>Disk based storage module for the HTTP caching filter.</dd>
+<dt><a href="mod_cache_socache.html">mod_cache_socache</a></dt><dd>Shared object cache (socache) based storage module for the
+HTTP caching filter.</dd>
<dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
<dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
<dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
Modified: httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en Sun Mar 25 22:35:18 2012
@@ -506,7 +506,7 @@ of the index listing</td></tr>
<h3>See also</h3>
<ul>
-<li><code class="directive"><a href="../mod/mod_autoindex.html#readmename">ReadmeName</a></code></li>
+<li><code class="directive"><a href="#readmename">ReadmeName</a></code></li>
</ul>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja [utf-8] Sun Mar 25 22:35:18 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 689261:1293065 (outdated) -->
+<!-- English Revision: 689261:1303788 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko [euc-kr] Sun Mar 25 22:35:18 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 103423:1293065 (outdated) -->
+<!-- English Revision: 103423:1303788 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr [utf-8] Sun Mar 25 22:35:18 2012
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 807930:1293065 (outdated) -->
+<!-- English Revision: 807930:1303788 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.html.en Sun Mar 25 22:35:18 2012
@@ -112,6 +112,12 @@
supported by this module. The <code class="program"><a href="../programs/htcacheclean.html">htcacheclean</a></code> tool is
provided to list cached URLs, remove cached URLs, or to maintain the size
of the disk cache within size and inode limits.</dd>
+ <dt><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></dt>
+ <dd>Implements a shared object cache based storage manager. Headers and
+ bodies are stored together beneath a single key based on the URL of the
+ response being cached. Multiple content negotiated responses can
+ be stored concurrently, however the caching of partial content is not
+ supported by this module.</dd>
</dl>
<p>Further details, discussion, and examples, are provided in the
@@ -156,7 +162,7 @@
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="related" id="related">Related Modules and Directives</a></h2>
- <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li></ul></td></tr></table>
+ <table class="related"><tr><th>Related Modules</th><th>Related Directives</th></tr><tr><td><ul><li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li><li><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></li></ul></td><td><ul><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheroot">CacheRoot</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlevels">CacheDirLevels</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachedirlength">CacheDirLength</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cacheminfilesize">CacheMinFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_disk.html#cachemaxfilesize">CacheMaxFileSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocache">CacheSocache</a></code></li><li><code class="directiv
e"><a href="../mod/mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachemaxsize">CacheSocacheMaxSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize</a></code></li><li><code class="directive"><a href="../mod/mod_cache_socache.html#cachesocachereadtime">CacheSocacheReadTime</a></code></li></ul></td></tr></table>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="sampleconf" id="sampleconf">Sample Configuration</a></h2>
@@ -468,7 +474,10 @@ manager</td></tr>
the content is cacheable.
<var>cache_type</var> <code>disk</code> instructs
<code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to use the disk based storage manager
- implemented by <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>.</p>
+ implemented by <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code>. <var>cache_type</var>
+ <code>socache</code> instructs <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code> to use the
+ shared object cache based storage manager implemented by
+ <code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code>.</p>
<p>In the event that the URL space overlaps between different
<code class="directive">CacheEnable</code> directives (as in the example below),
each possible storage manager will be run until the first one that
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache.xml?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.xml Sun Mar 25 22:35:18 2012
@@ -112,6 +112,12 @@
supported by this module. The <program>htcacheclean</program> tool is
provided to list cached URLs, remove cached URLs, or to maintain the size
of the disk cache within size and inode limits.</dd>
+ <dt><module>mod_cache_socache</module></dt>
+ <dd>Implements a shared object cache based storage manager. Headers and
+ bodies are stored together beneath a single key based on the URL of the
+ response being cached. Multiple content negotiated responses can
+ be stored concurrently, however the caching of partial content is not
+ supported by this module.</dd>
</dl>
<p>Further details, discussion, and examples, are provided in the
@@ -123,6 +129,7 @@
<related>
<modulelist>
<module>mod_cache_disk</module>
+ <module>mod_cache_socache</module>
</modulelist>
<directivelist>
<directive module="mod_cache_disk">CacheRoot</directive>
@@ -130,6 +137,12 @@
<directive module="mod_cache_disk">CacheDirLength</directive>
<directive module="mod_cache_disk">CacheMinFileSize</directive>
<directive module="mod_cache_disk">CacheMaxFileSize</directive>
+ <directive module="mod_cache_socache">CacheSocache</directive>
+ <directive module="mod_cache_socache">CacheSocacheMaxTime</directive>
+ <directive module="mod_cache_socache">CacheSocacheMinTime</directive>
+ <directive module="mod_cache_socache">CacheSocacheMaxSize</directive>
+ <directive module="mod_cache_socache">CacheSocacheReadSize</directive>
+ <directive module="mod_cache_socache">CacheSocacheReadTime</directive>
</directivelist>
</related>
</section>
@@ -348,7 +361,10 @@ manager</description>
the content is cacheable.
<var>cache_type</var> <code>disk</code> instructs
<module>mod_cache</module> to use the disk based storage manager
- implemented by <module>mod_cache_disk</module>.</p>
+ implemented by <module>mod_cache_disk</module>. <var>cache_type</var>
+ <code>socache</code> instructs <module>mod_cache</module> to use the
+ shared object cache based storage manager implemented by
+ <module>mod_cache_socache</module>.</p>
<p>In the event that the URL space overlaps between different
<directive>CacheEnable</directive> directives (as in the example below),
each possible storage manager will be run until the first one that
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.html.en Sun Mar 25 22:35:18 2012
@@ -79,7 +79,12 @@
<li><img alt="" src="../images/down.gif" /> <a href="#cachereadtime">CacheReadTime</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#cacheroot">CacheRoot</a></li>
</ul>
-</div>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code></li>
+<li><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code></li>
+<li><a href="../caching.html">Caching Guide</a></li>
+</ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="CacheDirLength" id="CacheDirLength">CacheDirLength</a> <a name="cachedirlength" id="cachedirlength">Directive</a></h2>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.xml?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache_disk.xml Sun Mar 25 22:35:18 2012
@@ -66,6 +66,9 @@
cache.</p>
</note>
</summary>
+<seealso><module>mod_cache</module></seealso>
+<seealso><module>mod_cache_socache</module></seealso>
+<seealso><a href="../caching.html">Caching Guide</a></seealso>
<directivesynopsis>
<name>CacheRoot</name>
Added: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html?rev=1305167&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html (added)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html Sun Mar 25 22:35:18 2012
@@ -0,0 +1,5 @@
+# GENERATED FROM XML -- DO NOT EDIT
+
+URI: mod_cache_socache.html.en
+Content-Language: en
+Content-type: text/html; charset=ISO-8859-1
Added: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html.en?rev=1305167&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html.en (added)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.html.en Sun Mar 25 22:35:18 2012
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><!--
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ This file is generated from xml source: DO NOT EDIT
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ -->
+<title>mod_cache_socache - Apache HTTP Server</title>
+<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
+<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
+<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" />
+<link href="../images/favicon.ico" rel="shortcut icon" /></head>
+<body>
+<div id="page-header">
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
+<p class="apache">Apache HTTP Server Version 2.5</p>
+<img alt="" src="../images/feather.gif" /></div>
+<div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div>
+<div id="path">
+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="../">Version 2.5</a> > <a href="./">Modules</a></div>
+<div id="page-content">
+<div id="preamble"><h1>Apache Module mod_cache_socache</h1>
+<div class="toplang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cache_socache.html" title="English"> en </a></p>
+</div>
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Shared object cache (socache) based storage module for the
+HTTP caching filter.</td></tr>
+<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>cache_socache_module</td></tr>
+<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_cache_socache.c</td></tr></table>
+<h3>Summary</h3>
+
+ <p><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code> implements a shared object cache
+ (socache) based storage manager for <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>.</p>
+
+ <p>The headers and bodies of cached responses are combined, and stored
+ underneath a single key in the shared object cache. A
+ <a href="../socache.html">number of implementations</a> of shared object
+ caches are available to choose from.</p>
+
+ <p>Multiple content negotiated responses can be stored concurrently,
+ however the caching of partial content is not yet supported by this
+ module.</p>
+
+ <div class="example"><p><code>
+ # Turn on caching<br />
+ CacheSocache shmcb<br />
+ CacheSocacheMaxSize 102400<br />
+ <Location /foo><br />
+ <span class="indent">
+ CacheEnable socache<br />
+ </span>
+ </Location><br />
+ <br />
+ # Fall back to the disk cache<br />
+ CacheSocache shmcb<br />
+ CacheSocacheMaxSize 102400<br />
+ <Location /foo><br />
+ <span class="indent">
+ CacheEnable socache<br />
+ CacheEnable disk<br />
+ </span>
+ </Location><br />
+ </code></p></div>
+
+ <div class="note"><h3>Note:</h3>
+ <p><code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code> requires the services of
+ <code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code>, which must be loaded before
+ mod_cache_socache.</p>
+ </div>
+</div>
+<div id="quickview"><h3 class="directives">Directives</h3>
+<ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocache">CacheSocache</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachemaxsize">CacheSocacheMaxSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachemaxtime">CacheSocacheMaxTime</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachemintime">CacheSocacheMinTime</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachereadsize">CacheSocacheReadSize</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#cachesocachereadtime">CacheSocacheReadTime</a></li>
+</ul>
+<h3>See also</h3>
+<ul class="seealso">
+<li><code class="module"><a href="../mod/mod_cache.html">mod_cache</a></code></li>
+<li><code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code></li>
+<li><a href="../caching.html">Caching Guide</a></li>
+</ul></div>
+
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocache" id="CacheSocache">CacheSocache</a> <a name="cachesocache" id="cachesocache">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The directory root under which cache files are
+stored</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocache <var>type[:args]</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocache</code> directive defines the name of
+ the shared object cache implementation to use, followed by optional
+ arguments for that implementation. A <a href="../socache.html">number of
+ implementations</a> of shared object caches are available to choose
+ from.</p>
+
+ <div class="example"><p><code>
+ CacheSocache shmcb
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheMaxSize" id="CacheSocacheMaxSize">CacheSocacheMaxSize</a> <a name="cachesocachemaxsize" id="cachesocachemaxsize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum size (in bytes) of an entry to be placed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheMaxSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheMaxSize 102400</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheMaxSize</code> directive sets the
+ maximum size, in bytes, for the combined headers and body of a document
+ to be considered for storage in the cache. The larger the headers that
+ are stored alongside the body, the smaller the body may be.</p>
+
+ <p>The <code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code> module will only attempt to
+ cache responses that have an explicit content length, or that are small
+ enough to be written in one pass. This is done to allow the
+ <code class="module"><a href="../mod/mod_cache_disk.html">mod_cache_disk</a></code> module to have an opportunity to cache
+ responses larger than those cacheable within
+ <code class="module"><a href="../mod/mod_cache_socache.html">mod_cache_socache</a></code>.</p>
+
+ <div class="example"><p><code>
+ CacheSocacheMaxSize 102400
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheMaxTime" id="CacheSocacheMaxTime">CacheSocacheMaxTime</a> <a name="cachesocachemaxtime" id="cachesocachemaxtime">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum time (in seconds) for a document to be placed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheMaxTime <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheMaxTime 86400</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheMaxTime</code> directive sets the
+ maximum freshness lifetime, in seconds, for a document to be stored in
+ the cache. This value overrides the freshness lifetime defined for the
+ document by the HTTP protocol.</p>
+
+ <div class="example"><p><code>
+ CacheSocacheMaxTime 86400
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheMinTime" id="CacheSocacheMinTime">CacheSocacheMinTime</a> <a name="cachesocachemintime" id="cachesocachemintime">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum time (in seconds) for a document to be placed in the
+cache</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheMinTime <var>seconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheMinTime 600</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheMinTime</code> directive sets the
+ amount of seconds beyond the freshness lifetime of the response that the
+ response should be cached for in the shared object cache. If a response is
+ only stored for its freshness lifetime, there will be no opportunity to
+ revalidate the response to make it fresh again.</p>
+
+ <div class="example"><p><code>
+ CacheSocacheMinTime 600
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheReadSize" id="CacheSocacheReadSize">CacheSocacheReadSize</a> <a name="cachesocachereadsize" id="cachesocachereadsize">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The minimum size (in bytes) of the document to read and be cached
+ before sending the data downstream</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheReadSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheReadSize 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheReadSize</code> directive sets the
+ minimum amount of data, in bytes, to be read from the backend before the
+ data is sent to the client. The default of zero causes all data read of
+ any size to be passed downstream to the client immediately as it arrives.
+ Setting this to a higher value causes the disk cache to buffer at least
+ this amount before sending the result to the client. This can improve
+ performance when caching content from a slow reverse proxy.</p>
+
+ <p>This directive only takes effect when the data is being saved to the
+ cache, as opposed to data being served from the cache.</p>
+
+ <div class="example"><p><code>
+ CacheReadSize 102400
+ </code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="CacheSocacheReadTime" id="CacheSocacheReadTime">CacheSocacheReadTime</a> <a name="cachesocachereadtime" id="cachesocachereadtime">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The minimum time (in milliseconds) that should elapse while reading
+ before data is sent downstream</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheReadTime <var>milliseconds</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheReadTime 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_cache_socache</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.5 and later</td></tr>
+</table>
+ <p>The <code class="directive">CacheSocacheReadTime</code> directive sets the minimum amount
+ of elapsed time that should pass before making an attempt to send data
+ downstream to the client. During the time period, data will be buffered
+ before sending the result to the client. This can improve performance when
+ caching content from a reverse proxy.</p>
+
+ <p>The default of zero disables this option.</p>
+
+ <p>This directive only takes effect when the data is being saved to the
+ cache, as opposed to data being served from the cache. It is recommended
+ that this option be used alongside the
+ <code class="directive"><a href="#cachesocachereadsize">CacheSocacheReadSize</a></code> directive
+ to ensure that the server does not buffer excessively should data arrive faster
+ than expected.</p>
+
+ <div class="example"><p><code>
+ CacheSocacheReadTime 1000
+ </code></p></div>
+
+</div>
+</div>
+<div class="bottomlang">
+<p><span>Available Languages: </span><a href="../en/mod/mod_cache_socache.html" title="English"> en </a></p>
+</div><div id="footer">
+<p class="apache">Copyright 2012 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
+</body></html>
\ No newline at end of file
Added: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml?rev=1305167&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml (added)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml Sun Mar 25 22:35:18 2012
@@ -0,0 +1,247 @@
+<?xml version="1.0"?>
+<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
+<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
+<!-- $LastChangedRevision: 1174747 $ -->
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<modulesynopsis metafile="mod_cache_socache.xml.meta">
+
+<name>mod_cache_socache</name>
+<description>Shared object cache (socache) based storage module for the
+HTTP caching filter.</description>
+<status>Extension</status>
+<sourcefile>mod_cache_socache.c</sourcefile>
+<identifier>cache_socache_module</identifier>
+
+<summary>
+ <p><module>mod_cache_socache</module> implements a shared object cache
+ (socache) based storage manager for <module>mod_cache</module>.</p>
+
+ <p>The headers and bodies of cached responses are combined, and stored
+ underneath a single key in the shared object cache. A
+ <a href="../socache.html">number of implementations</a> of shared object
+ caches are available to choose from.</p>
+
+ <p>Multiple content negotiated responses can be stored concurrently,
+ however the caching of partial content is not yet supported by this
+ module.</p>
+
+ <example>
+ # Turn on caching<br />
+ CacheSocache shmcb<br />
+ CacheSocacheMaxSize 102400<br />
+ <Location /foo><br />
+ <indent>
+ CacheEnable socache<br />
+ </indent>
+ </Location><br />
+ <br />
+ # Fall back to the disk cache<br />
+ CacheSocache shmcb<br />
+ CacheSocacheMaxSize 102400<br />
+ <Location /foo><br />
+ <indent>
+ CacheEnable socache<br />
+ CacheEnable disk<br />
+ </indent>
+ </Location><br />
+ </example>
+
+ <note><title>Note:</title>
+ <p><module>mod_cache_socache</module> requires the services of
+ <module>mod_cache</module>, which must be loaded before
+ mod_cache_socache.</p>
+ </note>
+</summary>
+<seealso><module>mod_cache</module></seealso>
+<seealso><module>mod_cache_disk</module></seealso>
+<seealso><a href="../caching.html">Caching Guide</a></seealso>
+
+<directivesynopsis>
+<name>CacheSocache</name>
+<description>The directory root under which cache files are
+stored</description>
+<syntax>CacheSocache <var>type[:args]</var></syntax>
+<contextlist><context>server config</context><context>virtual host</context>
+</contextlist>
+<compatibility>Available in Apache 2.5 and later</compatibility>
+
+<usage>
+ <p>The <directive>CacheSocache</directive> directive defines the name of
+ the shared object cache implementation to use, followed by optional
+ arguments for that implementation. A <a href="../socache.html">number of
+ implementations</a> of shared object caches are available to choose
+ from.</p>
+
+ <example>
+ CacheSocache shmcb
+ </example>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>CacheSocacheMaxTime</name>
+<description>The maximum time (in seconds) for a document to be placed in the
+cache</description>
+<syntax>CacheSocacheMaxTime <var>seconds</var></syntax>
+<default>CacheSocacheMaxTime 86400</default>
+<contextlist><context>server config</context>
+ <context>virtual host</context>
+ <context>directory</context>
+ <context>.htaccess</context>
+</contextlist>
+<compatibility>Available in Apache 2.5 and later</compatibility>
+
+<usage>
+ <p>The <directive>CacheSocacheMaxTime</directive> directive sets the
+ maximum freshness lifetime, in seconds, for a document to be stored in
+ the cache. This value overrides the freshness lifetime defined for the
+ document by the HTTP protocol.</p>
+
+ <example>
+ CacheSocacheMaxTime 86400
+ </example>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>CacheSocacheMinTime</name>
+<description>The maximum time (in seconds) for a document to be placed in the
+cache</description>
+<syntax>CacheSocacheMinTime <var>seconds</var></syntax>
+<default>CacheSocacheMinTime 600</default>
+<contextlist><context>server config</context>
+ <context>virtual host</context>
+ <context>directory</context>
+ <context>.htaccess</context>
+</contextlist>
+<compatibility>Available in Apache 2.5 and later</compatibility>
+
+<usage>
+ <p>The <directive>CacheSocacheMinTime</directive> directive sets the
+ amount of seconds beyond the freshness lifetime of the response that the
+ response should be cached for in the shared object cache. If a response is
+ only stored for its freshness lifetime, there will be no opportunity to
+ revalidate the response to make it fresh again.</p>
+
+ <example>
+ CacheSocacheMinTime 600
+ </example>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>CacheSocacheMaxSize</name>
+<description>The maximum size (in bytes) of an entry to be placed in the
+cache</description>
+<syntax>CacheSocacheMaxSize <var>bytes</var></syntax>
+<default>CacheSocacheMaxSize 102400</default>
+<contextlist><context>server config</context>
+ <context>virtual host</context>
+ <context>directory</context>
+ <context>.htaccess</context>
+</contextlist>
+<compatibility>Available in Apache 2.5 and later</compatibility>
+
+<usage>
+ <p>The <directive>CacheSocacheMaxSize</directive> directive sets the
+ maximum size, in bytes, for the combined headers and body of a document
+ to be considered for storage in the cache. The larger the headers that
+ are stored alongside the body, the smaller the body may be.</p>
+
+ <p>The <module>mod_cache_socache</module> module will only attempt to
+ cache responses that have an explicit content length, or that are small
+ enough to be written in one pass. This is done to allow the
+ <module>mod_cache_disk</module> module to have an opportunity to cache
+ responses larger than those cacheable within
+ <module>mod_cache_socache</module>.</p>
+
+ <example>
+ CacheSocacheMaxSize 102400
+ </example>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>CacheSocacheReadSize</name>
+<description>The minimum size (in bytes) of the document to read and be cached
+ before sending the data downstream</description>
+<syntax>CacheSocacheReadSize <var>bytes</var></syntax>
+<default>CacheSocacheReadSize 0</default>
+<contextlist><context>server config</context>
+ <context>virtual host</context>
+ <context>directory</context>
+ <context>.htaccess</context>
+</contextlist>
+<compatibility>Available in Apache 2.5 and later</compatibility>
+
+<usage>
+ <p>The <directive>CacheSocacheReadSize</directive> directive sets the
+ minimum amount of data, in bytes, to be read from the backend before the
+ data is sent to the client. The default of zero causes all data read of
+ any size to be passed downstream to the client immediately as it arrives.
+ Setting this to a higher value causes the disk cache to buffer at least
+ this amount before sending the result to the client. This can improve
+ performance when caching content from a slow reverse proxy.</p>
+
+ <p>This directive only takes effect when the data is being saved to the
+ cache, as opposed to data being served from the cache.</p>
+
+ <example>
+ CacheReadSize 102400
+ </example>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>CacheSocacheReadTime</name>
+<description>The minimum time (in milliseconds) that should elapse while reading
+ before data is sent downstream</description>
+<syntax>CacheSocacheReadTime <var>milliseconds</var></syntax>
+<default>CacheSocacheReadTime 0</default>
+<contextlist><context>server config</context>
+ <context>virtual host</context>
+ <context>directory</context>
+ <context>.htaccess</context>
+</contextlist>
+<compatibility>Available in Apache 2.5 and later</compatibility>
+
+<usage>
+ <p>The <directive>CacheSocacheReadTime</directive> directive sets the minimum amount
+ of elapsed time that should pass before making an attempt to send data
+ downstream to the client. During the time period, data will be buffered
+ before sending the result to the client. This can improve performance when
+ caching content from a reverse proxy.</p>
+
+ <p>The default of zero disables this option.</p>
+
+ <p>This directive only takes effect when the data is being saved to the
+ cache, as opposed to data being served from the cache. It is recommended
+ that this option be used alongside the
+ <directive module="mod_cache_socache">CacheSocacheReadSize</directive> directive
+ to ensure that the server does not buffer excessively should data arrive faster
+ than expected.</p>
+
+ <example>
+ CacheSocacheReadTime 1000
+ </example>
+</usage>
+</directivesynopsis>
+
+</modulesynopsis>
Added: httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml.meta?rev=1305167&view=auto
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml.meta (added)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache_socache.xml.meta Sun Mar 25 22:35:18 2012
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- GENERATED FROM XML: DO NOT EDIT -->
+
+<metafile reference="mod_cache_socache.xml">
+ <basename>mod_cache_socache</basename>
+ <path>/mod/</path>
+ <relpath>..</relpath>
+
+ <variants>
+ <variant>en</variant>
+ </variants>
+</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_slotmem_shm.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_slotmem_shm.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_slotmem_shm.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_slotmem_shm.html.en Sun Mar 25 22:35:18 2012
@@ -38,7 +38,9 @@
restart, whether graceful or not. The data itself is
stored and restored within a file noted by the <code>name</code>
parameter in the <code>create</code> and <code>attach</code>
- calls.
+ calls. If not specified with an absolute path, the file will be
+ created relative to the path specified by the
+ <code class="directive"><a href="../mod/core.html#defaultruntimedir">DefaultRuntimeDir</a></code> directive.
</p>
<p><code>mod_slotmem_shm</code> provides the following API functions:
@@ -55,9 +57,9 @@
<dt><code>"none"</code></dt>
<dd><code>Does not persist shared memory in file.</code></dd>
<dt><code>"file-name"</code></dt>
- <dd><code>$server_root/file-name</code></dd>
+ <dd><code>[DefaultRuntimeDir]/file-name</code></dd>
<dt><code>"/absolute-file-name"</code></dt>
- <dd><code>$absolute-file-name</code></dd>
+ <dd><code>Absolute file name</code></dd>
</dl></dd>
<dt>apr_status_t attach(ap_slotmem_instance_t **new, const char *name, apr_size_t *item_size, unsigned int *item_num, apr_pool_t *pool)</dt>
Modified: httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/quickreference.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/quickreference.html.en Sun Mar 25 22:35:18 2012
@@ -294,6 +294,18 @@ cached by proxy servers</td></tr>
before data is sent downstream</td></tr>
<tr class="odd"><td><a href="mod_cache_disk.html#cacheroot">CacheRoot <var>directory</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The directory root under which cache files are
stored</td></tr>
+<tr><td><a href="mod_cache_socache.html#cachesocache">CacheSocache <var>type[:args]</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">The directory root under which cache files are
+stored</td></tr>
+<tr class="odd"><td><a href="mod_cache_socache.html#cachesocachemaxsize">CacheSocacheMaxSize <var>bytes</var></a></td><td> 102400 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum size (in bytes) of an entry to be placed in the
+cache</td></tr>
+<tr><td><a href="mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime <var>seconds</var></a></td><td> 86400 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum time (in seconds) for a document to be placed in the
+cache</td></tr>
+<tr class="odd"><td><a href="mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime <var>seconds</var></a></td><td> 600 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum time (in seconds) for a document to be placed in the
+cache</td></tr>
+<tr><td><a href="mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
+ before sending the data downstream</td></tr>
+<tr class="odd"><td><a href="mod_cache_socache.html#cachesocachereadtime">CacheSocacheReadTime <var>milliseconds</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum time (in milliseconds) that should elapse while reading
+ before data is sent downstream</td></tr>
<tr><td><a href="mod_cache.html#cachestaleonerror">CacheStaleOnError <var>on|off</var></a></td><td> on </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Serve stale content in place of 5xx responses.</td></tr>
<tr class="odd"><td><a href="mod_cache.html#cachestoreexpired">CacheStoreExpired On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Attempt to cache responses that the server reports as expired</td></tr>
<tr><td><a href="mod_cache.html#cachestorenostore">CacheStoreNoStore On|Off</a></td><td> Off </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Attempt to cache requests or responses that have been marked as no-store.</td></tr>
Modified: httpd/httpd/trunk/docs/manual/new_features_2_0.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_0.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_0.html.en (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_0.html.en Sun Mar 25 22:35:18 2012
@@ -225,7 +225,7 @@
<dt><code class="module"><a href="./mod/mod_auth_dbm.html">mod_auth_dbm</a></code></dt>
<dd>Now supports multiple types of DBM-like databases using the
- <code class="directive"><a href="./mod/mod_auth_dbm.html#authdbmtype">AuthDBMType</a></code>
+ <a href="../2.0/mod/mod_auth_dbm.html#AuthDBMType"><code>AuthDBMType</code></a>
directive.</dd>
</dl>
Modified: httpd/httpd/trunk/docs/manual/new_features_2_0.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_0.xml.de?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_0.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_0.xml.de Sun Mar 25 22:35:18 2012
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 420990:926409 (outdated) -->
+<!-- English Revision: 420990:1304805 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ja?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ja [utf-8] Sun Mar 25 22:35:18 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 420990:926409 (outdated) -->
+<!-- English Revision: 420990:1304805 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ko?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ko [euc-kr] Sun Mar 25 22:35:18 2012
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 420990:926409 (outdated) -->
+<!-- English Revision: 420990:1304805 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/new_features_2_0.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_0.xml.meta?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_0.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_0.xml.meta Sun Mar 25 22:35:18 2012
@@ -14,6 +14,6 @@
<variant outdated="yes">ko</variant>
<variant outdated="yes">pt-br</variant>
<variant outdated="yes">ru</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/new_features_2_0.xml.pt-br
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_0.xml.pt-br?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_0.xml.pt-br (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_0.xml.pt-br Sun Mar 25 22:35:18 2012
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.pt-br.xsl"?>
-<!-- English Revision: 420990:926409 (outdated) -->
+<!-- English Revision: 420990:1304805 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ru
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ru?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ru [koi8-r] (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_0.xml.ru [koi8-r] Sun Mar 25 22:35:18 2012
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='KOI8-R' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.ru.xsl"?>
-<!-- English Revision: 96910:926409 (outdated) -->
+<!-- English Revision: 96910:1304805 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/new_features_2_0.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_0.xml.tr?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_0.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_0.xml.tr [utf-8] Sun Mar 25 22:35:18 2012
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 926409 -->
+<!-- English Revision: 926409:1304805 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/sitemap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sitemap.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sitemap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/sitemap.html.en Sun Mar 25 22:35:18 2012
@@ -196,6 +196,7 @@ Server on HPUX</a></li>
<li><a href="mod/mod_buffer.html">Apache Module mod_buffer</a></li>
<li><a href="mod/mod_cache.html">Apache Module mod_cache</a></li>
<li><a href="mod/mod_cache_disk.html">Apache Module mod_cache_disk</a></li>
+<li><a href="mod/mod_cache_socache.html">Apache Module mod_cache_socache</a></li>
<li><a href="mod/mod_cern_meta.html">Apache Module mod_cern_meta</a></li>
<li><a href="mod/mod_cgi.html">Apache Module mod_cgi</a></li>
<li><a href="mod/mod_cgid.html">Apache Module mod_cgid</a></li>
Modified: httpd/httpd/trunk/docs/manual/socache.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/socache.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/socache.html.en (original)
+++ httpd/httpd/trunk/docs/manual/socache.html.en Sun Mar 25 22:35:18 2012
@@ -37,6 +37,7 @@
<p>The only configuration required is to select which cache provider
to use. This is the responsibility of modules using the cache, and
they enable selection using directives such as
+ <code class="directive"><a href="./mod/mod_cache_socache.html#cachesocache">CacheSocache</a></code>,
<code class="directive"><a href="./mod/mod_authn_socache.html#authncachesocache">AuthnCacheSOCache</a></code>,
<code class="directive"><a href="./mod/mod_ssl.html#sslsessioncache">SSLSessionCache</a></code>, and
<code class="directive"><a href="./mod/mod_ssl.html#sslstaplingcache">SSLStaplingCache</a></code>.</p>
Modified: httpd/httpd/trunk/docs/manual/socache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/socache.xml?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/socache.xml (original)
+++ httpd/httpd/trunk/docs/manual/socache.xml Sun Mar 25 22:35:18 2012
@@ -40,6 +40,7 @@
<p>The only configuration required is to select which cache provider
to use. This is the responsibility of modules using the cache, and
they enable selection using directives such as
+ <directive module="mod_cache_socache">CacheSocache</directive>,
<directive module="mod_authn_socache">AuthnCacheSOCache</directive>,
<directive module="mod_ssl">SSLSessionCache</directive>, and
<directive module="mod_ssl">SSLStaplingCache</directive>.</p>
Modified: httpd/httpd/trunk/docs/manual/upgrading.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/upgrading.html.en?rev=1305167&r1=1305166&r2=1305167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.html.en (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.html.en Sun Mar 25 22:35:18 2012
@@ -278,7 +278,11 @@
<li><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>: The default format of the <code>*_DN</code>
variables has changed. The old format can still be used with the new
<code>LegacyDNStringFormat</code> argument to <code class="directive"><a href="./mod/mod_ssl.html#ssloptions">SSLOptions</a></code>. The SSLv2 protocol is
- no longer supported.</li>
+ no longer supported. <code class="directive"><a href="./mod/mod_ssl.html#sslproxycheckpeercn 	 ">SSLProxyCheckPeerCN
+ </a></code> and <code class="directive"><a href="./mod/mod_ssl.html#sslproxycheckpeerexpire 	 ">SSLProxyCheckPeerExpire
+ </a></code> now default to On, causing proxy requests to HTTPS hosts
+ with bad or outdated certificates to fail with a 502 status code (Bad
+ gateway)</li>
<li><code class="program"><a href="./programs/htpasswd.html">htpasswd</a></code> now uses MD5 hash by default on
all platforms.</li>