httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r711521 - in /httpd/httpd/trunk/docs/manual: ./ mod/ programs/
Date Wed, 05 Nov 2008 06:49:29 GMT
Author: takashi
Date: Tue Nov  4 22:49:29 2008
New Revision: 711521

Remove mod_mem_cache from documents
(Sync with r711470)


Modified: httpd/httpd/trunk/docs/manual/caching.xml
--- httpd/httpd/trunk/docs/manual/caching.xml (original)
+++ httpd/httpd/trunk/docs/manual/caching.xml Tue Nov  4 22:49:29 2008
@@ -26,8 +26,7 @@
     <p>This document supplements the <module>mod_cache</module>,
-    <module>mod_disk_cache</module>, <module>mod_mem_cache</module>,
-    <module>mod_file_cache</module> and <a 
+    <module>mod_disk_cache</module>, <module>mod_file_cache</module>
and <a 
     href="programs/htcacheclean.html">htcacheclean</a> reference documentation.
     It describes how to use Apache's caching features to accelerate web and 
     proxy serving, while avoiding common problems and misconfigurations.</p>
@@ -43,7 +42,7 @@
     handling, both as an origin webserver and as a proxy.</p>
     <p><module>mod_cache</module> and its provider modules 
-    <module>mod_mem_cache</module> and <module>mod_disk_cache</module>

+    <module>mod_disk_cache</module> 
     provide intelligent, HTTP-aware caching. The content itself is stored
     in the cache, and mod_cache aims to honour all of the various HTTP
     headers and options that control the cachability of content. It can
@@ -83,7 +82,6 @@
-        <module>mod_mem_cache</module>
@@ -215,7 +213,8 @@
       changed in size or modification time. As such, even if Apache is
       caching local content, even expired content may still be served faster
       from the cache if it has not changed. As long as reading from the cache
-      store is faster than reading from the backend (e.g. an in-memory cache 
+      store is faster than reading from the backend (e.g. <module
+      >mod_disk_cache</module> with memory disk
       compared to reading from disk).</p> 
@@ -396,19 +395,16 @@
-        <module>mod_mem_cache</module>
         <directive module="mod_file_cache">CacheFile</directive>
-        <directive module="mod_cache">CacheEnable</directive>
-        <directive module="mod_cache">CacheDisable</directive>
     <p>The act of opening a file can itself be a source of delay, particularly 
     on network filesystems. By maintaining a cache of open file descriptors
     for commonly served files, Apache can avoid this delay. Currently Apache
-    provides two different implementations of File-Handle Caching.</p> 
+    provides one implementation of File-Handle Caching.</p> 
@@ -447,21 +443,6 @@
       descriptor closed.</p>
-    <section>
-      <title>CacheEnable fd</title>
-      <p><module>mod_mem_cache</module> also provides its own file-handle

-      caching scheme, which can be enabled via the 
-      <directive module="mod_cache">CacheEnable</directive> directive.</p>
-      <example>
-      <pre>CacheEnable fd /</pre>
-      </example>
-      <p>As with all of <module>mod_cache</module> this type of file-handle
-      caching is intelligent, and handles will not be maintained beyond
-      the expiry time of the cached content.</p>
-    </section>
   <section id="inmemory">
@@ -469,7 +450,6 @@
-        <module>mod_mem_cache</module>
@@ -535,11 +515,6 @@
     caching there are some circumstances in which in-memory caching may be 
     better performed by Apache.</p>
-    <p>Firstly, an operating system can only cache files it knows about. If 
-    you are running Apache as a proxy server, the files you are caching are
-    not locally stored but remotely served. If you still want the unbeatable
-    speed of in-memory caching, Apache's own memory caching is needed.</p>
       <title>MMapStatic Caching</title>
@@ -565,25 +540,6 @@
       to ensure that the files mapped are not so large as to cause the
       system to swap memory.</p>
-    <section>
-      <title>mod_mem_cache Caching</title>
-      <p><module>mod_mem_cache</module> provides a HTTP-aware intelligent
-      in-memory cache. It also uses heap memory directly, which means that
-      even if <var>MMap</var> is not supported on your system, 
-      <module>mod_mem_cache</module> may still be able to perform caching.</p>
-      <p>Caching of this type is enabled via;</p>
-      <example><pre>
-# Enable memory caching
-CacheEnable mem /
-# Limit the size of the cache to 1 Megabyte
-MCacheSize 1024</pre>
-      </example>
-    </section>
   <section id="disk">
@@ -600,9 +556,8 @@
     <p><module>mod_disk_cache</module> provides a disk-based caching mechanism

-    for <module>mod_cache</module>. As with <module>mod_mem_cache</module>
-    this cache is intelligent and content will be served from the cache only
-    as long as it is considered valid.</p>
+    for <module>mod_cache</module>. This cache is intelligent and content will
+    be served from the cache only as long as it is considered valid.</p>
     <p>Typically the module will be configured as so;</p>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.xml
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.xml Tue Nov  4 22:49:29 2008
@@ -41,20 +41,11 @@
     href="">RFC 2616</a> compliant HTTP
     content cache that can be used to cache either local or proxied content.
     <module>mod_cache</module> requires the services of one or more storage
-    management modules. Two storage management modules are included in
+    management modules. One storage management module is included in
     the base Apache distribution:</p>
     <dd>implements a disk based storage manager.</dd>
-    <dt><module>mod_mem_cache</module></dt>
-    <dd>implements a memory based storage manager. 
-    <module>mod_mem_cache</module> can be configured to operate in two
-    modes: caching open file descriptors or caching objects in heap storage.
-    <module>mod_mem_cache</module> can be used to cache locally generated content
-    or to cache backend server content for <module>mod_proxy</module> when
-    configured using <directive module="mod_proxy">ProxyPass</directive>
-    (aka <dfn>reverse proxy</dfn>)</dd>
     <p>Content is stored in and retrieved from the cache using URI based keys. Content
@@ -68,7 +59,6 @@
-        <module>mod_mem_cache</module>
         <directive module="mod_disk_cache">CacheRoot</directive>
@@ -76,12 +66,6 @@
         <directive module="mod_disk_cache">CacheDirLength</directive>
         <directive module="mod_disk_cache">CacheMinFileSize</directive>
         <directive module="mod_disk_cache">CacheMaxFileSize</directive>
-        <directive module="mod_mem_cache">MCacheSize</directive>
-        <directive module="mod_mem_cache">MCacheMaxObjectCount</directive>
-        <directive module="mod_mem_cache">MCacheMinObjectSize</directive>
-        <directive module="mod_mem_cache">MCacheMaxObjectSize</directive>
-        <directive module="mod_mem_cache">MCacheRemovalAlgorithm</directive>
-        <directive module="mod_mem_cache">MCacheMaxStreamingBuffer</directive>
@@ -95,9 +79,7 @@
       <br />
       &lt;IfModule mod_cache.c&gt;<br />
-        #LoadModule disk_cache_module modules/<br />
-        # If you want to use mod_disk_cache instead of mod_mem_cache,<br />
-        # uncomment the line above and comment out the LoadModule line below.<br />
+        LoadModule disk_cache_module modules/<br />
         &lt;IfModule mod_disk_cache.c&gt;<br />
           CacheRoot c:/cacheroot<br />
@@ -107,17 +89,6 @@
         &lt;/IfModule&gt; <br />
         <br />
-        LoadModule mem_cache_module modules/<br />
-        &lt;IfModule mod_mem_cache.c&gt;<br />
-        <indent>
-          CacheEnable mem  /<br />
-          MCacheSize 4096<br />
-          MCacheMaxObjectCount 100<br />
-          MCacheMinObjectSize 1<br />
-          MCacheMaxObjectSize 2048<br />
-        </indent>
-        &lt;/IfModule&gt;<br />
-        <br />
         # When acting as a proxy, don't cache the list of security updates<br />
         CacheDisable http://security.update.server/update-list/<br />
@@ -137,15 +108,10 @@
     <p>The <directive>CacheEnable</directive> directive instructs
     <module>mod_cache</module> to cache urls at or below
     <var>url-string</var>. The cache storage manager is specified with the
-    <var>cache_type</var> argument. <var>cache_type</var> <code>
-    instructs <module>mod_cache</module> to use the memory based storage
-    manager implemented by <module>mod_mem_cache</module>. 
+    <var>cache_type</var> argument. 
     <var>cache_type</var> <code>disk</code> instructs
     <module>mod_cache</module> to use the disk based storage manager
-    implemented by <module>mod_disk_cache</module>.
-    <var>cache_type</var> <code>fd</code> instructs
-    <module>mod_cache</module> to use the file descriptor cache implemented
-    by <module>mod_mem_cache</module>.</p>
+    implemented by <module>mod_disk_cache</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
@@ -153,12 +119,6 @@
     run is determined by the order of the <directive>CacheEnable</directive>
     directives in the configuration file.</p>
-    <example>
-      CacheEnable  mem   /manual<br />
-      CacheEnable  fd    /images<br />
-      CacheEnable  disk  /<br />
-    </example>
     <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>

Modified: httpd/httpd/trunk/docs/manual/new_features_2_2.xml
--- httpd/httpd/trunk/docs/manual/new_features_2_2.xml (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_2.xml Tue Nov  4 22:49:29 2008
@@ -46,7 +46,7 @@
       <dd><module>mod_cache</module>, <module>mod_disk_cache</module>,
-          <module>mod_mem_cache</module> have undergone a lot of changes, and
+          mod_mem_cache(already removed from 2.3/2.4) have undergone a lot of changes, and
           are now considered production-quality. <program>htcacheclean</program>
           has been introduced to clean up <module>mod_disk_cache</module>

Modified: httpd/httpd/trunk/docs/manual/programs/configure.xml
--- httpd/httpd/trunk/docs/manual/programs/configure.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/configure.xml Tue Nov  4 22:49:29 2008
@@ -424,8 +424,7 @@
           <module>mod_cache</module>. This experimental module may be
           interesting for servers with high load or caching proxy servers. At
           least one storage management module (e.g.
-          <module>mod_disk_cache</module> or <module>mod_mem_cache</module>)
-          is also necessary.</dd>
+          <module>mod_disk_cache</module>) is also necessary.</dd>
         <dd>Enable the CERN-type meta files support provided by
@@ -494,10 +493,6 @@
         <dd>Enable logging of input and output bytes including headers provided
           by <module>mod_logio</module>.</dd>
-        <dt><code>--enable-mem-cache</code></dt>
-        <dd>Enable memory caching provided by
-          <module>mod_mem_cache</module>.</dd>
         automatical determining of <glossary ref="mime-type">MIME
@@ -702,7 +697,7 @@
             ./configure \<br />
                 --with-ldap \<br />
-                --enable-mods-shared="all ssl ldap cache proxy authn_alias mem_cache file_cache
authnz_ldap charset_lite dav_lock disk_cache"
+                --enable-mods-shared="all ssl ldap cache proxy authn_alias file_cache authnz_ldap
charset_lite dav_lock disk_cache"

View raw message