Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 71114 invoked from network); 6 Jun 2008 21:23:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Jun 2008 21:23:26 -0000 Received: (qmail 93264 invoked by uid 500); 6 Jun 2008 21:23:29 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 93218 invoked by uid 500); 6 Jun 2008 21:23:29 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 93209 invoked by uid 99); 6 Jun 2008 21:23:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jun 2008 14:23:29 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jun 2008 21:22:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 840D82388A32; Fri, 6 Jun 2008 14:23:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r664136 - /httpd/httpd/trunk/modules/cache/config.m4 Date: Fri, 06 Jun 2008 21:23:05 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080606212305.840D82388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Fri Jun 6 14:23:05 2008 New Revision: 664136 URL: http://svn.apache.org/viewvc?rev=664136&view=rev Log: These are declared CACHE_DECLARE and should be consumed from mod_cache by mod_mem_cache. The duplicate cache_util import is a dead giveaway that this was broken. In order to backport, an MMN bump would be required because these cache_pqueue, cache_cache and cache_hash exported functions would be added to the "contract" of functions which are available from mod_cache for third party cache providers. Modified: httpd/httpd/trunk/modules/cache/config.m4 Modified: httpd/httpd/trunk/modules/cache/config.m4 URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/config.m4?rev=664136&r1=664135&r2=664136&view=diff ============================================================================== --- httpd/httpd/trunk/modules/cache/config.m4 (original) +++ httpd/httpd/trunk/modules/cache/config.m4 Fri Jun 6 14:23:05 2008 @@ -11,18 +11,14 @@ 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 -cache_util.lo dnl " + APACHE_MODULE(cache, dynamic file caching, $cache_objs, , most) APACHE_MODULE(disk_cache, disk caching module, , , most) -APACHE_MODULE(mem_cache, memory caching module, $mem_cache_objs, , ) +APACHE_MODULE(mem_cache, memory caching module, , , ) AC_DEFUN([CHECK_DISTCACHE], [ AC_MSG_CHECKING(whether Distcache is required)