]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bootstrapped
authorhno <>
Tue, 22 Aug 2006 06:10:45 +0000 (06:10 +0000)
committerhno <>
Tue, 22 Aug 2006 06:10:45 +0000 (06:10 +0000)
src/Makefile.in

index d51de7e864e2223255fd8b99f4af1ff7d170f50d..e5d1810ad8aa13e7a453f60603975b104c4c4bfb 100644 (file)
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.399 2006/08/13 00:10:43 hno Exp $
+#  $Id: Makefile.in,v 1.400 2006/08/22 00:10:45 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -182,8 +182,8 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \
        ACLUrlPort.cc ACLUrlPort.h ACLUserData.cc ACLUserData.h asn.cc \
        AsyncEngine.cc AsyncEngine.h authenticate.cc authenticate.h \
        cache_cf.cc CacheDigest.cc cache_manager.cc CacheManager.h \
-       carp.cc cbdata.cc client_db.cc client_side.cc client_side.h \
-       client_side_reply.cc client_side_reply.h \
+       carp.cc cbdata.cc cbdata.h client_db.cc client_side.cc \
+       client_side.h client_side_reply.cc client_side_reply.h \
        client_side_request.cc client_side_request.h BodyReader.cc \
        BodyReader.h ClientRequestContext.h clientStream.cc \
        clientStream.h CommIO.h CompletionDispatcher.cc \
@@ -229,24 +229,24 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \
        neighbors.cc net_db.cc Packer.cc Packer.h Parsing.cc Parsing.h \
        ProfStats.cc pconn.cc pconn.h peer_digest.cc peer_select.cc \
        PeerSelectState.h PingData.h protos.h redirect.cc referer.cc \
-       refresh.cc send-announce.cc snmp_core.cc snmp_agent.cc squid.h \
-       SquidNew.cc tunnel.cc ACLCertificateData.cc \
-       ACLCertificateData.h ACLCertificate.cc ACLCertificate.h \
-       ssl_support.cc ssl_support.h stat.cc StatHist.cc String.cc \
-       stmem.cc stmem.h store.cc Store.h StoreFileSystem.cc \
-       StoreFileSystem.h StoreHashIndex.h store_io.cc StoreIOBuffer.h \
-       StoreIOState.cc StoreIOState.h store_client.cc StoreClient.h \
-       store_digest.cc store_dir.cc store_key_md5.cc store_log.cc \
-       store_rebuild.cc store_swapin.cc store_swapmeta.cc \
-       store_swapout.cc StoreMeta.cc StoreMeta.h StoreMetaMD5.cc \
-       StoreMetaMD5.h StoreMetaSTD.cc StoreMetaSTD.h \
+       refresh.cc RemovalPolicy.cc RemovalPolicy.h send-announce.cc \
+       snmp_core.cc snmp_agent.cc squid.h SquidNew.cc \
+       ACLCertificateData.cc ACLCertificateData.h ACLCertificate.cc \
+       ACLCertificate.h ssl_support.cc ssl_support.h stat.cc \
+       StatHist.cc String.cc stmem.cc stmem.h store.cc Store.h \
+       StoreFileSystem.cc StoreFileSystem.h StoreHashIndex.h \
+       store_io.cc StoreIOBuffer.h StoreIOState.cc StoreIOState.h \
+       store_client.cc StoreClient.h store_digest.cc store_dir.cc \
+       store_key_md5.cc store_log.cc store_rebuild.cc store_swapin.cc \
+       store_swapmeta.cc store_swapout.cc StoreMeta.cc StoreMeta.h \
+       StoreMetaMD5.cc StoreMetaMD5.h StoreMetaSTD.cc StoreMetaSTD.h \
        StoreMetaUnpacker.cc StoreMetaUnpacker.h StoreMetaURL.cc \
        StoreMetaURL.h StoreMetaVary.cc StoreMetaVary.h StoreSearch.h \
        StoreSwapLogData.cc StoreSwapLogData.h Server.cc Server.h \
-       structs.h SwapDir.cc SwapDir.h time.cc tools.cc typedefs.h \
-       unlinkd.cc url.cc URL.h URLScheme.cc URLScheme.h urn.cc \
-       useragent.cc wais.cc wccp.cc wccp2.cc whois.cc wordlist.cc \
-       wordlist.h win32.cc
+       structs.h SwapDir.cc SwapDir.h time.cc tools.cc tunnel.cc \
+       typedefs.h unlinkd.cc url.cc URL.h URLScheme.cc URLScheme.h \
+       urn.cc useragent.cc wais.cc wccp.cc wccp2.cc whois.cc \
+       wordlist.cc wordlist.h win32.cc
 am__objects_1 = ACLARP.$(OBJEXT)
 @ENABLE_ARP_ACL_TRUE@am__objects_2 = $(am__objects_1)
 am__objects_3 = $(am__objects_2) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \
@@ -330,23 +330,24 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \
        net_db.$(OBJEXT) Packer.$(OBJEXT) Parsing.$(OBJEXT) \
        $(am__objects_15) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \
        peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \
-       refresh.$(OBJEXT) send-announce.$(OBJEXT) $(am__objects_17) \
-       SquidNew.$(OBJEXT) tunnel.$(OBJEXT) $(am__objects_19) \
-       stat.$(OBJEXT) StatHist.$(OBJEXT) String.$(OBJEXT) \
-       stmem.$(OBJEXT) store.$(OBJEXT) StoreFileSystem.$(OBJEXT) \
-       store_io.$(OBJEXT) StoreIOState.$(OBJEXT) \
-       store_client.$(OBJEXT) store_digest.$(OBJEXT) \
-       store_dir.$(OBJEXT) store_key_md5.$(OBJEXT) \
-       store_log.$(OBJEXT) store_rebuild.$(OBJEXT) \
-       store_swapin.$(OBJEXT) store_swapmeta.$(OBJEXT) \
-       store_swapout.$(OBJEXT) StoreMeta.$(OBJEXT) \
-       StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
-       StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
-       StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
-       Server.$(OBJEXT) SwapDir.$(OBJEXT) time.$(OBJEXT) \
-       tools.$(OBJEXT) $(am__objects_20) url.$(OBJEXT) \
-       URLScheme.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) \
-       wais.$(OBJEXT) wccp.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \
+       refresh.$(OBJEXT) RemovalPolicy.$(OBJEXT) \
+       send-announce.$(OBJEXT) $(am__objects_17) SquidNew.$(OBJEXT) \
+       $(am__objects_19) stat.$(OBJEXT) StatHist.$(OBJEXT) \
+       String.$(OBJEXT) stmem.$(OBJEXT) store.$(OBJEXT) \
+       StoreFileSystem.$(OBJEXT) store_io.$(OBJEXT) \
+       StoreIOState.$(OBJEXT) store_client.$(OBJEXT) \
+       store_digest.$(OBJEXT) store_dir.$(OBJEXT) \
+       store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \
+       store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
+       store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
+       StoreMeta.$(OBJEXT) StoreMetaMD5.$(OBJEXT) \
+       StoreMetaSTD.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \
+       StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \
+       StoreSwapLogData.$(OBJEXT) Server.$(OBJEXT) SwapDir.$(OBJEXT) \
+       time.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
+       $(am__objects_20) url.$(OBJEXT) URLScheme.$(OBJEXT) \
+       urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) \
+       wccp.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \
        wordlist.$(OBJEXT) $(am__objects_22)
 nodist_squid_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \
        string_arrays.$(OBJEXT)
@@ -429,14 +430,14 @@ am__tests_testCacheManager_SOURCES_DIST = debug.cc globals.cc \
        multicast.cc mem_node.cc MemBuf.cc MemObject.cc mime.cc \
        neighbors.cc net_db.cc Packer.cc Parsing.cc pconn.cc \
        peer_digest.cc peer_select.cc redirect.cc referer.cc \
-       refresh.cc Server.cc snmp_core.cc snmp_agent.cc \
-       ACLCertificateData.cc ACLCertificateData.h ACLCertificate.cc \
-       ACLCertificate.h ssl_support.cc ssl_support.h stat.cc \
-       StatHist.cc stmem.cc store.cc store_client.cc store_digest.cc \
-       store_dir.cc store_io.cc store_key_md5.cc store_log.cc \
-       store_rebuild.cc store_swapin.cc store_swapmeta.cc \
-       store_swapout.cc StoreFileSystem.cc StoreIOState.cc \
-       StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
+       refresh.cc RemovalPolicy.cc Server.cc snmp_core.cc \
+       snmp_agent.cc ACLCertificateData.cc ACLCertificateData.h \
+       ACLCertificate.cc ACLCertificate.h ssl_support.cc \
+       ssl_support.h stat.cc StatHist.cc stmem.cc store.cc \
+       store_client.cc store_digest.cc store_dir.cc store_io.cc \
+       store_key_md5.cc store_log.cc store_rebuild.cc store_swapin.cc \
+       store_swapmeta.cc store_swapout.cc StoreFileSystem.cc \
+       StoreIOState.cc StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
        StoreMetaUnpacker.cc StoreMetaURL.cc StoreMetaVary.cc \
        StoreSwapLogData.cc tools.cc tunnel.cc SwapDir.cc url.cc \
        URLScheme.cc urn.cc useragent.cc wais.cc wccp2.cc whois.cc \
@@ -474,21 +475,22 @@ am_tests_testCacheManager_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \
        neighbors.$(OBJEXT) net_db.$(OBJEXT) Packer.$(OBJEXT) \
        Parsing.$(OBJEXT) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \
        peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \
-       refresh.$(OBJEXT) Server.$(OBJEXT) $(am__objects_17) \
-       $(am__objects_19) stat.$(OBJEXT) StatHist.$(OBJEXT) \
-       stmem.$(OBJEXT) store.$(OBJEXT) store_client.$(OBJEXT) \
-       store_digest.$(OBJEXT) store_dir.$(OBJEXT) store_io.$(OBJEXT) \
-       store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \
-       store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
-       store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
-       StoreFileSystem.$(OBJEXT) StoreIOState.$(OBJEXT) \
-       StoreMeta.$(OBJEXT) StoreMetaMD5.$(OBJEXT) \
-       StoreMetaSTD.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \
-       StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \
-       StoreSwapLogData.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
-       SwapDir.$(OBJEXT) url.$(OBJEXT) URLScheme.$(OBJEXT) \
-       urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) \
-       wccp2.$(OBJEXT) whois.$(OBJEXT) wordlist.$(OBJEXT)
+       refresh.$(OBJEXT) RemovalPolicy.$(OBJEXT) Server.$(OBJEXT) \
+       $(am__objects_17) $(am__objects_19) stat.$(OBJEXT) \
+       StatHist.$(OBJEXT) stmem.$(OBJEXT) store.$(OBJEXT) \
+       store_client.$(OBJEXT) store_digest.$(OBJEXT) \
+       store_dir.$(OBJEXT) store_io.$(OBJEXT) store_key_md5.$(OBJEXT) \
+       store_log.$(OBJEXT) store_rebuild.$(OBJEXT) \
+       store_swapin.$(OBJEXT) store_swapmeta.$(OBJEXT) \
+       store_swapout.$(OBJEXT) StoreFileSystem.$(OBJEXT) \
+       StoreIOState.$(OBJEXT) StoreMeta.$(OBJEXT) \
+       StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
+       StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
+       StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
+       tools.$(OBJEXT) tunnel.$(OBJEXT) SwapDir.$(OBJEXT) \
+       url.$(OBJEXT) URLScheme.$(OBJEXT) urn.$(OBJEXT) \
+       useragent.$(OBJEXT) wais.$(OBJEXT) wccp2.$(OBJEXT) \
+       whois.$(OBJEXT) wordlist.$(OBJEXT)
 nodist_tests_testCacheManager_OBJECTS = repl_modules.$(OBJEXT) \
        string_arrays.$(OBJEXT)
 tests_testCacheManager_OBJECTS = $(am_tests_testCacheManager_OBJECTS) \
@@ -508,8 +510,8 @@ am__tests_testCoss_SOURCES_DIST = tests/testCoss.cc tests/testMain.cc \
        DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
        DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
        NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
-       EventLoop.cc event.cc HttpMsg.cc store_dir.cc store.cc \
-       HttpRequestMethod.cc store_key_md5.cc string_arrays.c \
+       EventLoop.cc event.cc HttpMsg.cc RemovalPolicy.cc store_dir.cc \
+       store.cc HttpRequestMethod.cc store_key_md5.cc string_arrays.c \
        Parsing.cc ConfigOption.cc SwapDir.cc authenticate.cc \
        tests/stub_acl.cc tests/stub_cache_cf.cc tests/stub_helper.cc \
        cbdata.cc String.cc tests/stub_comm.cc \
@@ -531,7 +533,7 @@ am__tests_testCoss_SOURCES_DIST = tests/testCoss.cc tests/testMain.cc \
 am__objects_27 = $(am__objects_26) $(am__objects_6) \
        CacheDigest.$(OBJEXT) ConfigParser.$(OBJEXT) \
        EventLoop.$(OBJEXT) event.$(OBJEXT) HttpMsg.$(OBJEXT) \
-       store_dir.$(OBJEXT) store.$(OBJEXT) \
+       RemovalPolicy.$(OBJEXT) store_dir.$(OBJEXT) store.$(OBJEXT) \
        HttpRequestMethod.$(OBJEXT) store_key_md5.$(OBJEXT) \
        string_arrays.$(OBJEXT) Parsing.$(OBJEXT) \
        ConfigOption.$(OBJEXT) SwapDir.$(OBJEXT) \
@@ -574,16 +576,16 @@ am__DEPENDENCIES_1 = libsquid.la libauth.la \
        repl/lru/store_repl_lru.o
 am__tests_testEvent_SOURCES_DIST = debug.cc EventLoop.h EventLoop.cc \
        globals.cc HttpRequest.cc HttpRequestMethod.cc mem.cc \
-       String.cc tests/testEvent.cc tests/testEvent.h \
-       tests/testMain.cc time.cc access_log.cc acl.cc acl_noncore.cc \
-       ACLChecklist.cc ACLProxyAuth.cc ACLStringData.cc \
-       ACLRegexData.cc ACLUserData.cc authenticate.cc BodyReader.cc \
-       cache_manager.cc cache_cf.cc CacheDigest.cc carp.cc cbdata.cc \
-       client_db.cc client_side.cc client_side_reply.cc \
-       client_side_request.cc clientStream.cc comm_select.cc \
-       comm_select.h comm_select_win32.cc comm_poll.cc comm_poll.h \
-       comm_epoll.cc comm_epoll.h comm_kqueue.cc comm_kqueue.h \
-       ConfigOption.cc ConfigParser.cc CommonPool.h \
+       RemovalPolicy.cc String.cc tests/testEvent.cc \
+       tests/testEvent.h tests/testMain.cc time.cc access_log.cc \
+       acl.cc acl_noncore.cc ACLChecklist.cc ACLProxyAuth.cc \
+       ACLStringData.cc ACLRegexData.cc ACLUserData.cc \
+       authenticate.cc BodyReader.cc cache_manager.cc cache_cf.cc \
+       CacheDigest.cc carp.cc cbdata.cc client_db.cc client_side.cc \
+       client_side_reply.cc client_side_request.cc clientStream.cc \
+       comm_select.cc comm_select.h comm_select_win32.cc comm_poll.cc \
+       comm_poll.h comm_epoll.cc comm_epoll.h comm_kqueue.cc \
+       comm_kqueue.h ConfigOption.cc ConfigParser.cc CommonPool.h \
        CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
        DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
        DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
@@ -622,7 +624,8 @@ am__tests_testEvent_SOURCES_DIST = debug.cc EventLoop.h EventLoop.cc \
        wordlist.cc
 am_tests_testEvent_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \
        globals.$(OBJEXT) HttpRequest.$(OBJEXT) \
-       HttpRequestMethod.$(OBJEXT) mem.$(OBJEXT) String.$(OBJEXT) \
+       HttpRequestMethod.$(OBJEXT) mem.$(OBJEXT) \
+       RemovalPolicy.$(OBJEXT) String.$(OBJEXT) \
        tests/testEvent.$(OBJEXT) tests/testMain.$(OBJEXT) \
        time.$(OBJEXT) access_log.$(OBJEXT) acl.$(OBJEXT) \
        acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) \
@@ -674,16 +677,16 @@ tests_testEvent_OBJECTS = $(am_tests_testEvent_OBJECTS) \
        $(nodist_tests_testEvent_OBJECTS)
 am__tests_testEventLoop_SOURCES_DIST = debug.cc EventLoop.h \
        EventLoop.cc globals.cc HttpRequest.cc HttpRequestMethod.cc \
-       mem.cc String.cc tests/testEventLoop.cc tests/testEventLoop.h \
-       tests/testMain.cc time.cc access_log.cc acl.cc acl_noncore.cc \
-       ACLChecklist.cc ACLProxyAuth.cc ACLStringData.cc \
-       ACLRegexData.cc ACLUserData.cc authenticate.cc BodyReader.cc \
-       cache_manager.cc cache_cf.cc CacheDigest.cc carp.cc cbdata.cc \
-       client_db.cc client_side.cc client_side_reply.cc \
-       client_side_request.cc clientStream.cc comm_select.cc \
-       comm_select.h comm_select_win32.cc comm_poll.cc comm_poll.h \
-       comm_epoll.cc comm_epoll.h comm_kqueue.cc comm_kqueue.h \
-       ConfigOption.cc ConfigParser.cc CommonPool.h \
+       mem.cc RemovalPolicy.cc String.cc tests/testEventLoop.cc \
+       tests/testEventLoop.h tests/testMain.cc time.cc access_log.cc \
+       acl.cc acl_noncore.cc ACLChecklist.cc ACLProxyAuth.cc \
+       ACLStringData.cc ACLRegexData.cc ACLUserData.cc \
+       authenticate.cc BodyReader.cc cache_manager.cc cache_cf.cc \
+       CacheDigest.cc carp.cc cbdata.cc client_db.cc client_side.cc \
+       client_side_reply.cc client_side_request.cc clientStream.cc \
+       comm_select.cc comm_select.h comm_select_win32.cc comm_poll.cc \
+       comm_poll.h comm_epoll.cc comm_epoll.h comm_kqueue.cc \
+       comm_kqueue.h ConfigOption.cc ConfigParser.cc CommonPool.h \
        CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
        DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
        DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
@@ -722,7 +725,8 @@ am__tests_testEventLoop_SOURCES_DIST = debug.cc EventLoop.h \
        wordlist.cc
 am_tests_testEventLoop_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \
        globals.$(OBJEXT) HttpRequest.$(OBJEXT) \
-       HttpRequestMethod.$(OBJEXT) mem.$(OBJEXT) String.$(OBJEXT) \
+       HttpRequestMethod.$(OBJEXT) mem.$(OBJEXT) \
+       RemovalPolicy.$(OBJEXT) String.$(OBJEXT) \
        tests/testEventLoop.$(OBJEXT) tests/testMain.$(OBJEXT) \
        time.$(OBJEXT) access_log.$(OBJEXT) acl.$(OBJEXT) \
        acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) \
@@ -774,17 +778,20 @@ tests_testEventLoop_OBJECTS = $(am_tests_testEventLoop_OBJECTS) \
        $(nodist_tests_testEventLoop_OBJECTS)
 am__objects_29 = tests/testHeader_ACL.$(OBJEXT) \
        tests/testHeader_AsyncEngine.$(OBJEXT) \
+       tests/testHeader_cbdata.$(OBJEXT) \
        tests/testHeader_CompletionDispatcher.$(OBJEXT) \
        tests/testHeader_ConfigParser.$(OBJEXT) \
        tests/testHeader_client_side_request.$(OBJEXT) \
        tests/testHeader_comm.$(OBJEXT) \
        tests/testHeader_dlink.$(OBJEXT) \
+       tests/testHeader_errorpage.$(OBJEXT) \
        tests/testHeader_event.$(OBJEXT) \
        tests/testHeader_EventLoop.$(OBJEXT) \
        tests/testHeader_HttpHeader.$(OBJEXT) \
        tests/testHeader_HttpHeaderRange.$(OBJEXT) \
        tests/testHeader_HttpReply.$(OBJEXT) \
        tests/testHeader_HttpRequestMethod.$(OBJEXT) \
+       tests/testHeader_RemovalPolicy.$(OBJEXT) \
        tests/testHeader_SquidTime.$(OBJEXT) \
        tests/testHeader_Store.$(OBJEXT) \
        tests/testHeader_StoreEntryStream.$(OBJEXT) \
@@ -830,14 +837,14 @@ am__tests_testHttpRequest_SOURCES_DIST = debug.cc globals.cc \
        multicast.cc mem_node.cc MemBuf.cc MemObject.cc mime.cc \
        neighbors.cc net_db.cc Packer.cc Parsing.cc pconn.cc \
        peer_digest.cc peer_select.cc redirect.cc referer.cc \
-       refresh.cc Server.cc snmp_core.cc snmp_agent.cc \
-       ACLCertificateData.cc ACLCertificateData.h ACLCertificate.cc \
-       ACLCertificate.h ssl_support.cc ssl_support.h stat.cc \
-       StatHist.cc stmem.cc store.cc store_client.cc store_digest.cc \
-       store_dir.cc store_io.cc store_key_md5.cc store_log.cc \
-       store_rebuild.cc store_swapin.cc store_swapmeta.cc \
-       store_swapout.cc StoreFileSystem.cc StoreIOState.cc \
-       StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
+       refresh.cc RemovalPolicy.cc Server.cc snmp_core.cc \
+       snmp_agent.cc ACLCertificateData.cc ACLCertificateData.h \
+       ACLCertificate.cc ACLCertificate.h ssl_support.cc \
+       ssl_support.h stat.cc StatHist.cc stmem.cc store.cc \
+       store_client.cc store_digest.cc store_dir.cc store_io.cc \
+       store_key_md5.cc store_log.cc store_rebuild.cc store_swapin.cc \
+       store_swapmeta.cc store_swapout.cc StoreFileSystem.cc \
+       StoreIOState.cc StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
        StoreMetaUnpacker.cc StoreMetaURL.cc StoreMetaVary.cc \
        StoreSwapLogData.cc tools.cc tunnel.cc SwapDir.cc url.cc \
        URLScheme.cc urn.cc useragent.cc wais.cc wccp2.cc whois.cc \
@@ -875,21 +882,22 @@ am_tests_testHttpRequest_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \
        neighbors.$(OBJEXT) net_db.$(OBJEXT) Packer.$(OBJEXT) \
        Parsing.$(OBJEXT) pconn.$(OBJEXT) peer_digest.$(OBJEXT) \
        peer_select.$(OBJEXT) redirect.$(OBJEXT) referer.$(OBJEXT) \
-       refresh.$(OBJEXT) Server.$(OBJEXT) $(am__objects_17) \
-       $(am__objects_19) stat.$(OBJEXT) StatHist.$(OBJEXT) \
-       stmem.$(OBJEXT) store.$(OBJEXT) store_client.$(OBJEXT) \
-       store_digest.$(OBJEXT) store_dir.$(OBJEXT) store_io.$(OBJEXT) \
-       store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \
-       store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
-       store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
-       StoreFileSystem.$(OBJEXT) StoreIOState.$(OBJEXT) \
-       StoreMeta.$(OBJEXT) StoreMetaMD5.$(OBJEXT) \
-       StoreMetaSTD.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \
-       StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \
-       StoreSwapLogData.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
-       SwapDir.$(OBJEXT) url.$(OBJEXT) URLScheme.$(OBJEXT) \
-       urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) \
-       wccp2.$(OBJEXT) whois.$(OBJEXT) wordlist.$(OBJEXT)
+       refresh.$(OBJEXT) RemovalPolicy.$(OBJEXT) Server.$(OBJEXT) \
+       $(am__objects_17) $(am__objects_19) stat.$(OBJEXT) \
+       StatHist.$(OBJEXT) stmem.$(OBJEXT) store.$(OBJEXT) \
+       store_client.$(OBJEXT) store_digest.$(OBJEXT) \
+       store_dir.$(OBJEXT) store_io.$(OBJEXT) store_key_md5.$(OBJEXT) \
+       store_log.$(OBJEXT) store_rebuild.$(OBJEXT) \
+       store_swapin.$(OBJEXT) store_swapmeta.$(OBJEXT) \
+       store_swapout.$(OBJEXT) StoreFileSystem.$(OBJEXT) \
+       StoreIOState.$(OBJEXT) StoreMeta.$(OBJEXT) \
+       StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
+       StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
+       StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
+       tools.$(OBJEXT) tunnel.$(OBJEXT) SwapDir.$(OBJEXT) \
+       url.$(OBJEXT) URLScheme.$(OBJEXT) urn.$(OBJEXT) \
+       useragent.$(OBJEXT) wais.$(OBJEXT) wccp2.$(OBJEXT) \
+       whois.$(OBJEXT) wordlist.$(OBJEXT)
 nodist_tests_testHttpRequest_OBJECTS = repl_modules.$(OBJEXT) \
        string_arrays.$(OBJEXT)
 tests_testHttpRequest_OBJECTS = $(am_tests_testHttpRequest_OBJECTS) \
@@ -909,8 +917,8 @@ am__tests_testNull_SOURCES_DIST = tests/testNull.cc tests/testMain.cc \
        DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
        DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
        NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
-       EventLoop.cc event.cc HttpMsg.cc store_dir.cc store.cc \
-       HttpRequestMethod.cc store_key_md5.cc string_arrays.c \
+       EventLoop.cc event.cc HttpMsg.cc RemovalPolicy.cc store_dir.cc \
+       store.cc HttpRequestMethod.cc store_key_md5.cc string_arrays.c \
        Parsing.cc ConfigOption.cc SwapDir.cc authenticate.cc \
        tests/stub_acl.cc tests/stub_cache_cf.cc tests/stub_helper.cc \
        cbdata.cc String.cc tests/stub_comm.cc \
@@ -946,8 +954,8 @@ am__tests_testStore_SOURCES_DIST = tests/stub_store_swapout.cc \
        DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
        DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
        NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
-       EventLoop.cc event.cc HttpMsg.cc store_dir.cc store.cc \
-       HttpRequestMethod.cc store_key_md5.cc string_arrays.c \
+       EventLoop.cc event.cc HttpMsg.cc RemovalPolicy.cc store_dir.cc \
+       store.cc HttpRequestMethod.cc store_key_md5.cc string_arrays.c \
        Parsing.cc ConfigOption.cc SwapDir.cc authenticate.cc \
        tests/stub_acl.cc tests/stub_cache_cf.cc tests/stub_helper.cc \
        cbdata.cc String.cc tests/stub_comm.cc \
@@ -975,7 +983,7 @@ am_tests_testString_OBJECTS = mem.$(OBJEXT) String.$(OBJEXT) \
 tests_testString_OBJECTS = $(am_tests_testString_OBJECTS)
 am__tests_testURL_SOURCES_DIST = debug.cc url.cc URLScheme.cc \
        globals.cc HttpRequest.cc HttpRequestMethod.cc mem.cc \
-       String.cc tests/testURL.cc tests/testURL.h \
+       RemovalPolicy.cc String.cc tests/testURL.cc tests/testURL.h \
        tests/testURLScheme.cc tests/testURLScheme.h tests/testMain.cc \
        time.cc access_log.cc acl.cc acl_noncore.cc ACLChecklist.cc \
        ACLProxyAuth.cc ACLStringData.cc ACLRegexData.cc \
@@ -1023,7 +1031,8 @@ am__tests_testURL_SOURCES_DIST = debug.cc url.cc URLScheme.cc \
        useragent.cc wais.cc wccp2.cc whois.cc wordlist.cc
 am_tests_testURL_OBJECTS = debug.$(OBJEXT) url.$(OBJEXT) \
        URLScheme.$(OBJEXT) globals.$(OBJEXT) HttpRequest.$(OBJEXT) \
-       HttpRequestMethod.$(OBJEXT) mem.$(OBJEXT) String.$(OBJEXT) \
+       HttpRequestMethod.$(OBJEXT) mem.$(OBJEXT) \
+       RemovalPolicy.$(OBJEXT) String.$(OBJEXT) \
        tests/testURL.$(OBJEXT) tests/testURLScheme.$(OBJEXT) \
        tests/testMain.$(OBJEXT) time.$(OBJEXT) access_log.$(OBJEXT) \
        acl.$(OBJEXT) acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) \
@@ -1088,8 +1097,8 @@ am__tests_testUfs_SOURCES_DIST = tests/testUfs.cc tests/testMain.cc \
        DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
        DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
        NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
-       EventLoop.cc event.cc HttpMsg.cc store_dir.cc store.cc \
-       HttpRequestMethod.cc store_key_md5.cc string_arrays.c \
+       EventLoop.cc event.cc HttpMsg.cc RemovalPolicy.cc store_dir.cc \
+       store.cc HttpRequestMethod.cc store_key_md5.cc string_arrays.c \
        Parsing.cc ConfigOption.cc SwapDir.cc authenticate.cc \
        tests/stub_acl.cc tests/stub_cache_cf.cc tests/stub_helper.cc \
        cbdata.cc String.cc tests/stub_comm.cc \
@@ -1145,14 +1154,14 @@ am__tests_test_http_range_SOURCES_DIST = tests/test_http_range.cc \
        ipc.cc ipcache.cc list.cc logfile.cc mem.cc mem_node.cc \
        MemObject.cc mime.cc multicast.cc neighbors.cc net_db.cc \
        Parsing.cc peer_digest.cc peer_select.cc pconn.cc redirect.cc \
-       referer.cc refresh.cc Server.cc snmp_core.cc snmp_agent.cc \
-       ACLCertificateData.cc ACLCertificateData.h ACLCertificate.cc \
-       ACLCertificate.h ssl_support.cc ssl_support.h stat.cc \
-       StatHist.cc stmem.cc store.cc store_client.cc store_digest.cc \
-       store_dir.cc store_key_md5.cc store_io.cc store_log.cc \
-       store_rebuild.cc store_swapin.cc store_swapmeta.cc \
-       store_swapout.cc StoreFileSystem.cc StoreIOState.cc \
-       StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
+       referer.cc refresh.cc RemovalPolicy.cc Server.cc snmp_core.cc \
+       snmp_agent.cc ACLCertificateData.cc ACLCertificateData.h \
+       ACLCertificate.cc ACLCertificate.h ssl_support.cc \
+       ssl_support.h stat.cc StatHist.cc stmem.cc store.cc \
+       store_client.cc store_digest.cc store_dir.cc store_key_md5.cc \
+       store_io.cc store_log.cc store_rebuild.cc store_swapin.cc \
+       store_swapmeta.cc store_swapout.cc StoreFileSystem.cc \
+       StoreIOState.cc StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
        StoreMetaUnpacker.cc StoreMetaURL.cc StoreMetaVary.cc \
        StoreSwapLogData.cc String.cc SwapDir.cc time.cc tools.cc \
        tunnel.cc url.cc URLScheme.cc urn.cc useragent.cc wais.cc \
@@ -1188,19 +1197,19 @@ am_tests_test_http_range_OBJECTS = tests/test_http_range.$(OBJEXT) \
        neighbors.$(OBJEXT) net_db.$(OBJEXT) Parsing.$(OBJEXT) \
        peer_digest.$(OBJEXT) peer_select.$(OBJEXT) pconn.$(OBJEXT) \
        redirect.$(OBJEXT) referer.$(OBJEXT) refresh.$(OBJEXT) \
-       Server.$(OBJEXT) $(am__objects_17) $(am__objects_19) \
-       stat.$(OBJEXT) StatHist.$(OBJEXT) stmem.$(OBJEXT) \
-       store.$(OBJEXT) store_client.$(OBJEXT) store_digest.$(OBJEXT) \
-       store_dir.$(OBJEXT) store_key_md5.$(OBJEXT) store_io.$(OBJEXT) \
-       store_log.$(OBJEXT) store_rebuild.$(OBJEXT) \
-       store_swapin.$(OBJEXT) store_swapmeta.$(OBJEXT) \
-       store_swapout.$(OBJEXT) StoreFileSystem.$(OBJEXT) \
-       StoreIOState.$(OBJEXT) StoreMeta.$(OBJEXT) \
-       StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
-       StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
-       StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
-       String.$(OBJEXT) SwapDir.$(OBJEXT) time.$(OBJEXT) \
-       tools.$(OBJEXT) tunnel.$(OBJEXT) url.$(OBJEXT) \
+       RemovalPolicy.$(OBJEXT) Server.$(OBJEXT) $(am__objects_17) \
+       $(am__objects_19) stat.$(OBJEXT) StatHist.$(OBJEXT) \
+       stmem.$(OBJEXT) store.$(OBJEXT) store_client.$(OBJEXT) \
+       store_digest.$(OBJEXT) store_dir.$(OBJEXT) \
+       store_key_md5.$(OBJEXT) store_io.$(OBJEXT) store_log.$(OBJEXT) \
+       store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
+       store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
+       StoreFileSystem.$(OBJEXT) StoreIOState.$(OBJEXT) \
+       StoreMeta.$(OBJEXT) StoreMetaMD5.$(OBJEXT) \
+       StoreMetaSTD.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \
+       StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \
+       StoreSwapLogData.$(OBJEXT) String.$(OBJEXT) SwapDir.$(OBJEXT) \
+       time.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) url.$(OBJEXT) \
        URLScheme.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) \
        wais.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \
        wordlist.$(OBJEXT) Packer.$(OBJEXT) MemBuf.$(OBJEXT)
@@ -1228,31 +1237,32 @@ am__ufsdump_SOURCES_DIST = debug.cc int.cc mem.cc store_key_md5.cc \
        DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
        DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
        NullDelayId.cc NullDelayId.h disk.cc dns_internal.cc dns.cc \
-       enums.h errorpage.cc ElementList.h ESI.cc ESI.h ESIAssign.cc \
-       ESIAssign.h ESIAttempt.h ESIContext.cc ESIContext.h \
-       ESICustomParser.cc ESICustomParser.h ESIElement.h ESIExcept.h \
-       ESIExpatParser.cc ESIExpatParser.h ESIExpression.cc \
-       ESIExpression.h ESIInclude.cc ESIInclude.h ESILiteral.h \
-       ESILibxml2Parser.cc ESILibxml2Parser.h ESIParser.cc \
-       ESIParser.h ESISegment.cc ESISegment.h ESISequence.cc \
-       ESISequence.h ESIVar.h ESIVarState.cc ESIVarState.h ETag.cc \
-       event.cc external_acl.cc ExternalACLEntry.cc fd.cc fde.cc \
-       fde.h filemap.cc forward.cc forward.h fqdncache.cc ftp.cc \
-       gopher.cc helper.cc htcp.cc htcp.h http.cc HttpStatusLine.cc \
-       HttpHdrCc.cc HttpHdrRange.cc HttpHdrSc.cc HttpHdrScTarget.cc \
-       HttpHdrContRange.cc HttpHeader.cc HttpHeaderTools.cc \
-       HttpBody.cc HttpMsg.cc HttpReply.cc HttpRequest.cc \
-       HttpRequestMethod.cc icmp.cc icp_v2.cc icp_v3.cc ACLIdent.cc \
-       ACLIdent.h ident.cc internal.cc ipc.cc ipcache.cc \
-       LeakFinder.cc list.cc logfile.cc mem_node.cc mem_node.h Mem.h \
-       MemBuf.cc MemObject.cc MemObject.h mime.cc multicast.cc \
-       neighbors.cc net_db.cc Packer.cc Parsing.cc ProfStats.cc \
-       pconn.cc peer_digest.cc peer_select.cc protos.h redirect.cc \
-       referer.cc refresh.cc send-announce.cc snmp_core.cc \
-       snmp_agent.cc squid.h ACLCertificateData.cc \
-       ACLCertificateData.h ACLCertificate.cc ACLCertificate.h \
-       ssl_support.cc ssl_support.h tunnel.cc Server.cc SquidNew.cc \
-       stat.cc StatHist.cc stmem.cc store_io.cc StoreIOBuffer.h \
+       enums.h errorpage.cc errorpage.h ElementList.h ESI.cc ESI.h \
+       ESIAssign.cc ESIAssign.h ESIAttempt.h ESIContext.cc \
+       ESIContext.h ESICustomParser.cc ESICustomParser.h ESIElement.h \
+       ESIExcept.h ESIExpatParser.cc ESIExpatParser.h \
+       ESIExpression.cc ESIExpression.h ESIInclude.cc ESIInclude.h \
+       ESILiteral.h ESILibxml2Parser.cc ESILibxml2Parser.h \
+       ESIParser.cc ESIParser.h ESISegment.cc ESISegment.h \
+       ESISequence.cc ESISequence.h ESIVar.h ESIVarState.cc \
+       ESIVarState.h ETag.cc event.cc external_acl.cc \
+       ExternalACLEntry.cc fd.cc fde.cc fde.h filemap.cc forward.cc \
+       forward.h fqdncache.cc ftp.cc gopher.cc helper.cc htcp.cc \
+       htcp.h http.cc HttpStatusLine.cc HttpHdrCc.cc HttpHdrRange.cc \
+       HttpHdrSc.cc HttpHdrScTarget.cc HttpHdrContRange.cc \
+       HttpHeader.cc HttpHeaderTools.cc HttpBody.cc HttpMsg.cc \
+       HttpReply.cc HttpRequest.cc HttpRequestMethod.cc icmp.cc \
+       icp_v2.cc icp_v3.cc ACLIdent.cc ACLIdent.h ident.cc \
+       internal.cc ipc.cc ipcache.cc LeakFinder.cc list.cc logfile.cc \
+       mem_node.cc mem_node.h Mem.h MemBuf.cc MemObject.cc \
+       MemObject.h mime.cc multicast.cc neighbors.cc net_db.cc \
+       Packer.cc Parsing.cc ProfStats.cc pconn.cc peer_digest.cc \
+       peer_select.cc protos.h redirect.cc referer.cc refresh.cc \
+       RemovalPolicy.cc send-announce.cc snmp_core.cc snmp_agent.cc \
+       squid.h ACLCertificateData.cc ACLCertificateData.h \
+       ACLCertificate.cc ACLCertificate.h ssl_support.cc \
+       ssl_support.h tunnel.cc Server.cc SquidNew.cc stat.cc \
+       StatHist.cc stmem.cc store_io.cc StoreIOBuffer.h \
        StoreIOState.cc store_client.cc StoreClient.h store_digest.cc \
        store_dir.cc store_log.cc store_rebuild.cc store_swapin.cc \
        store_swapmeta.cc store_swapout.cc structs.h SwapDir.cc \
@@ -1296,12 +1306,13 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) mem.$(OBJEXT) \
        neighbors.$(OBJEXT) net_db.$(OBJEXT) Packer.$(OBJEXT) \
        Parsing.$(OBJEXT) $(am__objects_15) pconn.$(OBJEXT) \
        peer_digest.$(OBJEXT) peer_select.$(OBJEXT) redirect.$(OBJEXT) \
-       referer.$(OBJEXT) refresh.$(OBJEXT) send-announce.$(OBJEXT) \
-       $(am__objects_17) $(am__objects_19) tunnel.$(OBJEXT) \
-       Server.$(OBJEXT) SquidNew.$(OBJEXT) stat.$(OBJEXT) \
-       StatHist.$(OBJEXT) stmem.$(OBJEXT) store_io.$(OBJEXT) \
-       StoreIOState.$(OBJEXT) store_client.$(OBJEXT) \
-       store_digest.$(OBJEXT) store_dir.$(OBJEXT) store_log.$(OBJEXT) \
+       referer.$(OBJEXT) refresh.$(OBJEXT) RemovalPolicy.$(OBJEXT) \
+       send-announce.$(OBJEXT) $(am__objects_17) $(am__objects_19) \
+       tunnel.$(OBJEXT) Server.$(OBJEXT) SquidNew.$(OBJEXT) \
+       stat.$(OBJEXT) StatHist.$(OBJEXT) stmem.$(OBJEXT) \
+       store_io.$(OBJEXT) StoreIOState.$(OBJEXT) \
+       store_client.$(OBJEXT) store_digest.$(OBJEXT) \
+       store_dir.$(OBJEXT) store_log.$(OBJEXT) \
        store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
        store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
        SwapDir.$(OBJEXT) tools.$(OBJEXT) $(am__objects_20) \
@@ -1896,6 +1907,7 @@ squid_SOURCES = \
        CacheManager.h \
        carp.cc \
        cbdata.cc \
+       cbdata.h \
        client_db.cc \
        client_side.cc \
        client_side.h \
@@ -2018,11 +2030,12 @@ squid_SOURCES = \
        redirect.cc \
        referer.cc \
        refresh.cc \
+       RemovalPolicy.cc \
+       RemovalPolicy.h \
        send-announce.cc \
        $(SNMP_SOURCE) \
        squid.h \
        SquidNew.cc \
-       tunnel.cc \
        $(SSL_SOURCE) \
        stat.cc \
        StatHist.cc \
@@ -2070,6 +2083,7 @@ squid_SOURCES = \
        SwapDir.h \
        time.cc \
        tools.cc \
+       tunnel.cc \
        typedefs.h \
        $(UNLINKDSOURCE) \
        url.cc \
@@ -2229,6 +2243,7 @@ ufsdump_SOURCES = \
        $(DNSSOURCE) \
        enums.h \
        errorpage.cc \
+       errorpage.h \
        $(ESI_SOURCE) \
        ETag.cc \
        event.cc \
@@ -2289,6 +2304,7 @@ ufsdump_SOURCES = \
        redirect.cc \
        referer.cc \
        refresh.cc \
+       RemovalPolicy.cc \
        send-announce.cc \
        $(SNMP_SOURCE) \
        squid.h \
@@ -2642,6 +2658,7 @@ tests_testCacheManager_SOURCES = \
        redirect.cc \
        referer.cc \
        refresh.cc \
+       RemovalPolicy.cc \
        Server.cc \
        $(SNMP_SOURCE) \
        $(SSL_SOURCE) \
@@ -2711,6 +2728,7 @@ tests_testEvent_SOURCES = \
        HttpRequest.cc \
        HttpRequestMethod.cc \
        mem.cc \
+       RemovalPolicy.cc \
        String.cc \
        tests/testEvent.cc \
        tests/testEvent.h \
@@ -2862,6 +2880,7 @@ tests_testEventLoop_SOURCES = \
        HttpRequest.cc \
        HttpRequestMethod.cc \
        mem.cc \
+       RemovalPolicy.cc \
        String.cc \
        tests/testEventLoop.cc \
        tests/testEventLoop.h \
@@ -3008,17 +3027,20 @@ tests_testEventLoop_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
 HEADERS_TO_TEST = \
        tests/testHeader_ACL.cc \
        tests/testHeader_AsyncEngine.cc \
+       tests/testHeader_cbdata.cc \
        tests/testHeader_CompletionDispatcher.cc \
        tests/testHeader_ConfigParser.cc \
        tests/testHeader_client_side_request.cc \
        tests/testHeader_comm.cc \
        tests/testHeader_dlink.cc \
+       tests/testHeader_errorpage.cc \
        tests/testHeader_event.cc \
        tests/testHeader_EventLoop.cc \
        tests/testHeader_HttpHeader.cc \
        tests/testHeader_HttpHeaderRange.cc \
        tests/testHeader_HttpReply.cc \
        tests/testHeader_HttpRequestMethod.cc \
+       tests/testHeader_RemovalPolicy.cc \
        tests/testHeader_SquidTime.cc \
        tests/testHeader_Store.cc \
        tests/testHeader_StoreEntryStream.cc \
@@ -3117,6 +3139,7 @@ tests_test_http_range_SOURCES = \
        redirect.cc \
        referer.cc \
        refresh.cc \
+       RemovalPolicy.cc \
        Server.cc \
        $(SNMP_SOURCE) \
        $(SSL_SOURCE) \
@@ -3267,6 +3290,7 @@ tests_testHttpRequest_SOURCES = \
        redirect.cc \
        referer.cc \
        refresh.cc \
+       RemovalPolicy.cc \
        Server.cc \
        $(SNMP_SOURCE) \
        $(SSL_SOURCE) \
@@ -3339,6 +3363,7 @@ STORE_TEST_SOURCES = \
        EventLoop.cc \
        event.cc \
        HttpMsg.cc \
+       RemovalPolicy.cc \
        store_dir.cc \
        store.cc \
        HttpRequestMethod.cc \
@@ -3521,6 +3546,7 @@ tests_testURL_SOURCES = \
        HttpRequest.cc \
        HttpRequestMethod.cc \
        mem.cc \
+       RemovalPolicy.cc \
        String.cc \
        tests/testURL.cc \
        tests/testURL.h \
@@ -4121,6 +4147,8 @@ tests/testHeader_ACL.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_AsyncEngine.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
+tests/testHeader_cbdata.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_CompletionDispatcher.$(OBJEXT):  \
        tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_ConfigParser.$(OBJEXT): tests/$(am__dirstamp) \
@@ -4131,6 +4159,8 @@ tests/testHeader_comm.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_dlink.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
+tests/testHeader_errorpage.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_event.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_EventLoop.$(OBJEXT): tests/$(am__dirstamp) \
@@ -4143,6 +4173,8 @@ tests/testHeader_HttpReply.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_HttpRequestMethod.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
+tests/testHeader_RemovalPolicy.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_SquidTime.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_Store.$(OBJEXT): tests/$(am__dirstamp) \
@@ -4298,14 +4330,17 @@ mostlyclean-compile:
        -rm -f tests/testHeader_HttpHeaderRange.$(OBJEXT)
        -rm -f tests/testHeader_HttpReply.$(OBJEXT)
        -rm -f tests/testHeader_HttpRequestMethod.$(OBJEXT)
+       -rm -f tests/testHeader_RemovalPolicy.$(OBJEXT)
        -rm -f tests/testHeader_SquidTime.$(OBJEXT)
        -rm -f tests/testHeader_Store.$(OBJEXT)
        -rm -f tests/testHeader_StoreEntryStream.$(OBJEXT)
        -rm -f tests/testHeader_URL.$(OBJEXT)
        -rm -f tests/testHeader_URLScheme.$(OBJEXT)
+       -rm -f tests/testHeader_cbdata.$(OBJEXT)
        -rm -f tests/testHeader_client_side_request.$(OBJEXT)
        -rm -f tests/testHeader_comm.$(OBJEXT)
        -rm -f tests/testHeader_dlink.$(OBJEXT)
+       -rm -f tests/testHeader_errorpage.$(OBJEXT)
        -rm -f tests/testHeader_event.$(OBJEXT)
        -rm -f tests/testHeader_wordlist.$(OBJEXT)
        -rm -f tests/testHttpRequest.$(OBJEXT)
@@ -4421,6 +4456,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Packer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Parsing.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ProfStats.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RemovalPolicy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SquidNew.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StatHist.Po@am__quote@
@@ -4614,14 +4650,17 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_HttpHeaderRange.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_HttpReply.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_HttpRequestMethod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_RemovalPolicy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_SquidTime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_Store.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_StoreEntryStream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_URL.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_URLScheme.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_cbdata.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_client_side_request.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_comm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_dlink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_errorpage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_event.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_wordlist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHttpRequest.Po@am__quote@