You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2004/11/27 20:06:50 UTC
svn commit: r106737 - in httpd/httpd/trunk: . docs/manual/mod modules/cache modules/experimental
Author: jerenkrantz
Date: Sat Nov 27 11:06:48 2004
New Revision: 106737
URL: http://svn.apache.org/viewcvs?view=rev&rev=106737
Log:
At long last, promote mod_cache and friends out of experimental/.
Also, take quick pass through docs files to remove experimental label for them.
Reviewed by: Paul Querna, Bill Stoddard, Justin Erenkrantz
Added:
httpd/httpd/trunk/modules/cache/NWGNUdsk_cach
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/NWGNUdsk_cach
httpd/httpd/trunk/modules/cache/NWGNUmem_cach
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/NWGNUmem_cach
httpd/httpd/trunk/modules/cache/NWGNUmod_cach
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/NWGNUmod_cach
httpd/httpd/trunk/modules/cache/cache_cache.c
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/cache_cache.c
httpd/httpd/trunk/modules/cache/cache_cache.h
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/cache_cache.h
httpd/httpd/trunk/modules/cache/cache_hash.c
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/cache_hash.c
httpd/httpd/trunk/modules/cache/cache_hash.h
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/cache_hash.h
httpd/httpd/trunk/modules/cache/cache_pqueue.c
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/cache_pqueue.c
httpd/httpd/trunk/modules/cache/cache_pqueue.h
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/cache_pqueue.h
httpd/httpd/trunk/modules/cache/cache_storage.c
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/cache_storage.c
httpd/httpd/trunk/modules/cache/cache_util.c
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/cache_util.c
httpd/httpd/trunk/modules/cache/mod_cache.c
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/mod_cache.c
httpd/httpd/trunk/modules/cache/mod_cache.dsp
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/mod_cache.dsp
httpd/httpd/trunk/modules/cache/mod_cache.h
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/mod_cache.h
httpd/httpd/trunk/modules/cache/mod_cache.imp
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/mod_cache.imp
httpd/httpd/trunk/modules/cache/mod_disk_cache.c
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/mod_disk_cache.c
httpd/httpd/trunk/modules/cache/mod_disk_cache.dsp
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/mod_disk_cache.dsp
httpd/httpd/trunk/modules/cache/mod_mem_cache.c
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/mod_mem_cache.c
httpd/httpd/trunk/modules/cache/mod_mem_cache.dsp
- copied unchanged from r106736, httpd/httpd/trunk/modules/experimental/mod_mem_cache.dsp
Removed:
httpd/httpd/trunk/modules/experimental/NWGNUdsk_cach
httpd/httpd/trunk/modules/experimental/NWGNUmem_cach
httpd/httpd/trunk/modules/experimental/NWGNUmod_cach
httpd/httpd/trunk/modules/experimental/cache_cache.c
httpd/httpd/trunk/modules/experimental/cache_cache.h
httpd/httpd/trunk/modules/experimental/cache_hash.c
httpd/httpd/trunk/modules/experimental/cache_hash.h
httpd/httpd/trunk/modules/experimental/cache_pqueue.c
httpd/httpd/trunk/modules/experimental/cache_pqueue.h
httpd/httpd/trunk/modules/experimental/cache_storage.c
httpd/httpd/trunk/modules/experimental/cache_util.c
httpd/httpd/trunk/modules/experimental/mod_cache.c
httpd/httpd/trunk/modules/experimental/mod_cache.dsp
httpd/httpd/trunk/modules/experimental/mod_cache.h
httpd/httpd/trunk/modules/experimental/mod_cache.imp
httpd/httpd/trunk/modules/experimental/mod_disk_cache.c
httpd/httpd/trunk/modules/experimental/mod_disk_cache.dsp
httpd/httpd/trunk/modules/experimental/mod_mem_cache.c
httpd/httpd/trunk/modules/experimental/mod_mem_cache.dsp
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/STATUS
httpd/httpd/trunk/docs/manual/mod/mod_cache.xml
httpd/httpd/trunk/docs/manual/mod/mod_disk_cache.xml
httpd/httpd/trunk/docs/manual/mod/mod_mem_cache.xml
httpd/httpd/trunk/modules/cache/config.m4
httpd/httpd/trunk/modules/experimental/config.m4
Modified: httpd/httpd/trunk/CHANGES
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&rev=106737&p1=httpd/httpd/trunk/CHANGES&r1=106736&p2=httpd/httpd/trunk/CHANGES&r2=106737
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Sat Nov 27 11:06:48 2004
@@ -2,8 +2,10 @@
[Remove entries to the current 2.0 section below, when backported]
+ *) mod_cache/mod_mem_cache/mod_disk_cache: Move out of experimental.
+
*) Upgraded PCRE to version 5.0. [Brian Pane]
-
+
*) mod_cgid: Catch configuration problem where two web server instances
share same ServerRoot but admin forgot to use ScriptSock.
[Jeff Trawick]
Modified: httpd/httpd/trunk/STATUS
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/STATUS?view=diff&rev=106737&p1=httpd/httpd/trunk/STATUS&r1=106736&p2=httpd/httpd/trunk/STATUS&r2=106737
==============================================================================
--- httpd/httpd/trunk/STATUS (original)
+++ httpd/httpd/trunk/STATUS Sat Nov 27 11:06:48 2004
@@ -37,35 +37,6 @@
CURRENT VOTES:
- * Promote mod_cache from experimental to non-experimental
- status (keep issues noted below in EXPERIMENTAL MODULES as
- items to be addressed as a supported module).
- +1: jerenkrantz, pquerna, stoddard
- +0: jim, bnicholes
- -1:
- There are a couple of problems that need to be resolved
- before this module is moved out of experimental.
- 1) We need to at least review and comment on the RFC violations
- 2) Resolve issue of how to cache page fragements (or perhaps -if- we
- want to cache page fragements). Today, mod_cache/mod_mem_cache
- will cache #include 'virtual' requests (but not #include 'file'
- requests). This was accomplished by making CACHE_IN a
- CONTENT_SET-1 filter to force it to run before the SUBREQ_CORE
- filter. But now responses cannot be cached that include the
- effects of having been run through CONTENT_SET filters
- (mod_deflate, mod_expires, etc). We could rerun all the
- CONTENT_SET filters on the cached response, but this will not
- work in all cases. For example, mod_expires relies on installing
- the EXPIRATION filter during fixups. Contents served out of
- mod_cache (out of the quick_handler) bypass -all- the request
- line server hooks (Ryan really hated this. It is great for
- performance, but bad because of the complications listed above).
-
- jerenkrantz: I think it's time. We've done a *lot* of work to it, and
- we think most of the blatant RFC violations are now gone.
- mod_cache just belongs in cache/. There may still be bugs,
- but not likely to be major ones.
-
* httpd-std.conf and friends
a) httpd-std.conf should be tailored by install (from src or
@@ -478,12 +449,20 @@
* mod_cache: Handle ESI tags.
-EXPERIMENTAL MODULES:
-
- Experimental modules should eventually be be promoted to fully supported
- status or removed from the repository entirely (ie, the
- 'experiment' failed). This section tracks what needs to happen to
- get the modules promoted to fully supported status.
+ * mod_cache: Resolve issue of how to cache page fragements (or perhaps
+ -if- we want to cache page fragements). Today, mod_cache/mod_mem_cache
+ will cache #include 'virtual' requests (but not #include 'file'
+ requests). This was accomplished by making CACHE_IN a
+ CONTENT_SET-1 filter to force it to run before the SUBREQ_CORE
+ filter. But now responses cannot be cached that include the
+ effects of having been run through CONTENT_SET filters
+ (mod_deflate, mod_expires, etc). We could rerun all the
+ CONTENT_SET filters on the cached response, but this will not
+ work in all cases. For example, mod_expires relies on installing
+ the EXPIRATION filter during fixups. Contents served out of
+ mod_cache (out of the quick_handler) bypass -all- the request
+ line server hooks (Ryan really hated this. It is great for
+ performance, but bad because of the complications listed above).
mod_cache/mod_mem_cache/mod_disk_cache:
@@ -507,6 +486,13 @@
to collect status. Status should be queryable by
HTTP or SNMP?
jerenkrantz says: Yawn. Who cares.
+
+EXPERIMENTAL MODULES:
+
+ Experimental modules should eventually be be promoted to fully supported
+ status or removed from the repository entirely (ie, the
+ 'experiment' failed). This section tracks what needs to happen to
+ get the modules promoted to fully supported status.
PRs that have been suspended forever waiting for someone to
put them into 'the next release':
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_cache.xml?view=diff&rev=106737&p1=httpd/httpd/trunk/docs/manual/mod/mod_cache.xml&r1=106736&p2=httpd/httpd/trunk/docs/manual/mod/mod_cache.xml&r2=106737
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.xml Sat Nov 27 11:06:48 2004
@@ -23,15 +23,10 @@
<name>mod_cache</name>
<description>Content cache keyed to URIs.</description>
-<status>Experimental</status>
<sourcefile>mod_cache.c</sourcefile>
<identifier>cache_module</identifier>
<summary>
- <note type="warning">
- This module is experimental. Documentation is still under development...
- </note>
-
<p><module>mod_cache</module> implements an <a
href="http://www.ietf.org/rfc/rfc2616.txt">RFC 2616</a> compliant HTTP
content cache that can be used to cache either local or proxied content.
@@ -65,17 +60,10 @@
<directivelist>
<directive module="mod_disk_cache">CacheRoot</directive>
<directive module="mod_disk_cache">CacheSize</directive>
- <directive module="mod_disk_cache">CacheGcInterval</directive>
<directive module="mod_disk_cache">CacheDirLevels</directive>
<directive module="mod_disk_cache">CacheDirLength</directive>
- <directive module="mod_disk_cache">CacheExpiryCheck</directive>
<directive module="mod_disk_cache">CacheMinFileSize</directive>
<directive module="mod_disk_cache">CacheMaxFileSize</directive>
- <directive module="mod_disk_cache">CacheTimeMargin</directive>
- <directive module="mod_disk_cache">CacheGcDaily</directive>
- <directive module="mod_disk_cache">CacheGcUnused</directive>
- <directive module="mod_disk_cache">CacheGcClean</directive>
- <directive module="mod_disk_cache">CacheGcMemUsage</directive>
<directive module="mod_mem_cache">MCacheSize</directive>
<directive module="mod_mem_cache">MCacheMaxObjectCount</directive>
<directive module="mod_mem_cache">MCacheMinObjectSize</directive>
@@ -101,7 +89,6 @@
<IfModule mod_disk_cache.c><br />
<indent>
CacheRoot c:/cacheroot<br />
- CacheSize 256<br />
CacheEnable disk /<br />
CacheDirLevels 5<br />
CacheDirLength 3<br />
Modified: httpd/httpd/trunk/docs/manual/mod/mod_disk_cache.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_disk_cache.xml?view=diff&rev=106737&p1=httpd/httpd/trunk/docs/manual/mod/mod_disk_cache.xml&r1=106736&p2=httpd/httpd/trunk/docs/manual/mod/mod_disk_cache.xml&r2=106737
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_disk_cache.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_disk_cache.xml Sat Nov 27 11:06:48 2004
@@ -23,18 +23,13 @@
<name>mod_disk_cache</name>
<description>Content cache storage manager keyed to URIs</description>
-<status>Experimental</status>
<sourcefile>mod_disk_cache.c</sourcefile>
<identifier>disk_cache_module</identifier>
<summary>
- <note type="warning">
- This module is experimental. Documentation is still under development...
- </note>
-
<p><module>mod_disk_cache</module> implements a disk based storage
- manager. It is primarily of use in conjunction with
- <module>mod_proxy</module>.</p>
+ manager. It is primarily of use in conjunction
+ <module>mod_cache</module>.</p>
<p>Content is stored in and retrieved from the cache using URI based
keys. Content with access protection is not cached.</p>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_mem_cache.xml
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_mem_cache.xml?view=diff&rev=106737&p1=httpd/httpd/trunk/docs/manual/mod/mod_mem_cache.xml&r1=106736&p2=httpd/httpd/trunk/docs/manual/mod/mod_mem_cache.xml&r2=106737
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_mem_cache.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_mem_cache.xml Sat Nov 27 11:06:48 2004
@@ -23,16 +23,10 @@
<name>mod_mem_cache</name>
<description>Content cache keyed to URIs</description>
-<status>Experimental</status>
<sourcefile>mod_mem_cache.c</sourcefile>
<identifier>mem_cache_module</identifier>
<summary>
- <note type="warning">
- This module is experimental. Documentation is still under
- development...
- </note>
-
<p>This module <em>requires</em> the service of <module
>mod_cache</module>. It acts as a support module for <module
>mod_cache</module> and provides a memory based storage manager.
Copied: httpd/httpd/trunk/modules/cache/NWGNUdsk_cach (from r106736, httpd/httpd/trunk/modules/experimental/NWGNUdsk_cach)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/NWGNUdsk_cach?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/NWGNUdsk_cach&r1=106736&p2=httpd/httpd/trunk/modules/cache/NWGNUdsk_cach&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/NWGNUmem_cach (from r106736, httpd/httpd/trunk/modules/experimental/NWGNUmem_cach)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/NWGNUmem_cach?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/NWGNUmem_cach&r1=106736&p2=httpd/httpd/trunk/modules/cache/NWGNUmem_cach&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/NWGNUmod_cach (from r106736, httpd/httpd/trunk/modules/experimental/NWGNUmod_cach)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/NWGNUmod_cach?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/NWGNUmod_cach&r1=106736&p2=httpd/httpd/trunk/modules/cache/NWGNUmod_cach&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/cache_cache.c (from r106736, httpd/httpd/trunk/modules/experimental/cache_cache.c)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_cache.c?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/cache_cache.c&r1=106736&p2=httpd/httpd/trunk/modules/cache/cache_cache.c&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/cache_cache.h (from r106736, httpd/httpd/trunk/modules/experimental/cache_cache.h)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_cache.h?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/cache_cache.h&r1=106736&p2=httpd/httpd/trunk/modules/cache/cache_cache.h&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/cache_hash.c (from r106736, httpd/httpd/trunk/modules/experimental/cache_hash.c)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_hash.c?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/cache_hash.c&r1=106736&p2=httpd/httpd/trunk/modules/cache/cache_hash.c&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/cache_hash.h (from r106736, httpd/httpd/trunk/modules/experimental/cache_hash.h)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_hash.h?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/cache_hash.h&r1=106736&p2=httpd/httpd/trunk/modules/cache/cache_hash.h&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/cache_pqueue.c (from r106736, httpd/httpd/trunk/modules/experimental/cache_pqueue.c)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_pqueue.c?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/cache_pqueue.c&r1=106736&p2=httpd/httpd/trunk/modules/cache/cache_pqueue.c&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/cache_pqueue.h (from r106736, httpd/httpd/trunk/modules/experimental/cache_pqueue.h)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_pqueue.h?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/cache_pqueue.h&r1=106736&p2=httpd/httpd/trunk/modules/cache/cache_pqueue.h&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/cache_storage.c (from r106736, httpd/httpd/trunk/modules/experimental/cache_storage.c)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_storage.c?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/cache_storage.c&r1=106736&p2=httpd/httpd/trunk/modules/cache/cache_storage.c&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/cache_util.c (from r106736, httpd/httpd/trunk/modules/experimental/cache_util.c)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_util.c?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/cache_util.c&r1=106736&p2=httpd/httpd/trunk/modules/cache/cache_util.c&r2=106737
==============================================================================
Modified: httpd/httpd/trunk/modules/cache/config.m4
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/config.m4?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/cache/config.m4&r1=106736&p2=httpd/httpd/trunk/modules/cache/config.m4&r2=106737
==============================================================================
--- httpd/httpd/trunk/modules/cache/config.m4 (original)
+++ httpd/httpd/trunk/modules/cache/config.m4 Sat Nov 27 11:06:48 2004
@@ -6,4 +6,21 @@
APACHE_MODULE(file_cache, File cache, , , no)
+dnl # list of object files for mod_cache
+cache_objs="dnl
+mod_cache.lo dnl
+cache_storage.lo dnl
+cache_util.lo dnl
+"
+dnl # list of object files for mod_mem_cache
+mem_cache_objs="dnl
+mod_mem_cache.lo dnl
+cache_cache.lo dnl
+cache_pqueue.lo dnl
+cache_hash.lo dnl
+"
+APACHE_MODULE(cache, dynamic file caching, $cache_objs, , no)
+APACHE_MODULE(disk_cache, disk caching module, , , no)
+APACHE_MODULE(mem_cache, memory caching module, $mem_cache_objs, , no)
+
APACHE_MODPATH_FINISH
Copied: httpd/httpd/trunk/modules/cache/mod_cache.c (from r106736, httpd/httpd/trunk/modules/experimental/mod_cache.c)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_cache.c?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/mod_cache.c&r1=106736&p2=httpd/httpd/trunk/modules/cache/mod_cache.c&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/mod_cache.dsp (from r106736, httpd/httpd/trunk/modules/experimental/mod_cache.dsp)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_cache.dsp?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/mod_cache.dsp&r1=106736&p2=httpd/httpd/trunk/modules/cache/mod_cache.dsp&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/mod_cache.h (from r106736, httpd/httpd/trunk/modules/experimental/mod_cache.h)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_cache.h?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/mod_cache.h&r1=106736&p2=httpd/httpd/trunk/modules/cache/mod_cache.h&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/mod_cache.imp (from r106736, httpd/httpd/trunk/modules/experimental/mod_cache.imp)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_cache.imp?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/mod_cache.imp&r1=106736&p2=httpd/httpd/trunk/modules/cache/mod_cache.imp&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/mod_disk_cache.c (from r106736, httpd/httpd/trunk/modules/experimental/mod_disk_cache.c)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/mod_disk_cache.c&r1=106736&p2=httpd/httpd/trunk/modules/cache/mod_disk_cache.c&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/mod_disk_cache.dsp (from r106736, httpd/httpd/trunk/modules/experimental/mod_disk_cache.dsp)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_disk_cache.dsp?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/mod_disk_cache.dsp&r1=106736&p2=httpd/httpd/trunk/modules/cache/mod_disk_cache.dsp&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/mod_mem_cache.c (from r106736, httpd/httpd/trunk/modules/experimental/mod_mem_cache.c)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_mem_cache.c?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/mod_mem_cache.c&r1=106736&p2=httpd/httpd/trunk/modules/cache/mod_mem_cache.c&r2=106737
==============================================================================
Copied: httpd/httpd/trunk/modules/cache/mod_mem_cache.dsp (from r106736, httpd/httpd/trunk/modules/experimental/mod_mem_cache.dsp)
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_mem_cache.dsp?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/mod_mem_cache.dsp&r1=106736&p2=httpd/httpd/trunk/modules/cache/mod_mem_cache.dsp&r2=106737
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/NWGNUdsk_cach
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/NWGNUdsk_cach?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/NWGNUmem_cach
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/NWGNUmem_cach?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/NWGNUmod_cach
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/NWGNUmod_cach?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/cache_cache.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/cache_cache.c?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/cache_cache.h
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/cache_cache.h?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/cache_hash.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/cache_hash.c?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/cache_hash.h
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/cache_hash.h?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/cache_pqueue.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/cache_pqueue.c?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/cache_pqueue.h
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/cache_pqueue.h?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/cache_storage.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/cache_storage.c?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/cache_util.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/cache_util.c?view=auto&rev=106736
==============================================================================
Modified: httpd/httpd/trunk/modules/experimental/config.m4
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/config.m4?view=diff&rev=106737&p1=httpd/httpd/trunk/modules/experimental/config.m4&r1=106736&p2=httpd/httpd/trunk/modules/experimental/config.m4&r2=106737
==============================================================================
--- httpd/httpd/trunk/modules/experimental/config.m4 (original)
+++ httpd/httpd/trunk/modules/experimental/config.m4 Sat Nov 27 11:06:48 2004
@@ -9,22 +9,6 @@
APACHE_MODULE(charset_lite, character set translation, , , no)
fi
-dnl # list of object files for mod_cache
-cache_objs="dnl
-mod_cache.lo dnl
-cache_storage.lo dnl
-cache_util.lo dnl
-"
-dnl # list of object files for mod_mem_cache
-mem_cache_objs="dnl
-mod_mem_cache.lo dnl
-cache_cache.lo dnl
-cache_pqueue.lo dnl
-cache_hash.lo dnl
-"
-APACHE_MODULE(cache, dynamic file caching, $cache_objs, , no)
-APACHE_MODULE(disk_cache, disk caching module, , , no)
-APACHE_MODULE(mem_cache, memory caching module, $mem_cache_objs, , no)
APACHE_MODULE(example, example and demo module, , , no)
APACHE_MODULE(case_filter, example uppercase conversion filter, , , no)
APACHE_MODULE(case_filter_in, example uppercase conversion input filter, , , no)
Deleted: /httpd/httpd/trunk/modules/experimental/mod_cache.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/mod_cache.c?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/mod_cache.dsp
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/mod_cache.dsp?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/mod_cache.h
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/mod_cache.h?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/mod_cache.imp
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/mod_cache.imp?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/mod_disk_cache.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/mod_disk_cache.c?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/mod_disk_cache.dsp
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/mod_disk_cache.dsp?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/mod_mem_cache.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/mod_mem_cache.c?view=auto&rev=106736
==============================================================================
Deleted: /httpd/httpd/trunk/modules/experimental/mod_mem_cache.dsp
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/experimental/mod_mem_cache.dsp?view=auto&rev=106736
==============================================================================