Convert one of the new static ConfigParser methods into a instance method, and setup...

diff --git a/src/ACL.h b/src/ACL.h
index bd25261d331a28ada528f6faa49854880c2c7ef3..0a28abde7425c8d268bf8d187845191189624d44 100644 (file)
--- a/src/ACL.h
+++ b/src/ACL.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACL.h,v 1.15 2006/04/22 05:29:16 robertc Exp $
+ * $Id: ACL.h,v 1.16 2006/04/25 12:00:29 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -42,12 +42,14 @@
  */
 #include "typedefs.h"
 
+class ConfigParser;
+
 /* acl.c */
 SQUIDCEXTERN void aclDestroyAccessList(acl_access **list);
 SQUIDCEXTERN void aclDestroyAcls(ACL **);
 SQUIDCEXTERN void aclDestroyAclList(acl_list **);
-SQUIDCEXTERN void aclParseAccessLine(acl_access **);
-SQUIDCEXTERN void aclParseAclList(acl_list **);
+SQUIDCEXTERN void aclParseAccessLine(ConfigParser &parser, acl_access **);
+SQUIDCEXTERN void aclParseAclList(ConfigParser &parser, acl_list **);
 SQUIDCEXTERN int aclIsProxyAuth(const char *name);
 SQUIDCEXTERN err_type aclGetDenyInfoPage(acl_deny_info_list ** head, const char *name);
 
@@ -68,7 +70,7 @@ public:
     void operator delete(void *);
 
     static ACL *Factory (char const *);
-    static void ParseAclLine(ACL ** head);
+    static void ParseAclLine(ConfigParser &parser, ACL ** head);
     static void Initialize();
     static ACL* FindByName(const char *name);
 

diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc
index ed7708573b064108239f436f444d7395d36e4e0d..4fa83386d0783c4053c43dd9240bdfedad407d53 100644 (file)
--- a/src/ConfigParser.cc
+++ b/src/ConfigParser.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ConfigParser.cc,v 1.1 2006/04/23 11:10:31 robertc Exp $
+ * $Id: ConfigParser.cc,v 1.2 2006/04/25 12:00:29 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -37,7 +37,7 @@
 #include "globals.h"
 
 void
-ConfigParser::Destruct()
+ConfigParser::destruct()
 {
     shutting_down = 1;
     fatalf("Bungled %s line %d: %s",

diff --git a/src/ConfigParser.h b/src/ConfigParser.h
index d01d02d6669799d4aab6fd59f1e2854d3490d7d6..8a8b93025606c52dc89036999e07596a9fd8cac0 100644 (file)
--- a/src/ConfigParser.h
+++ b/src/ConfigParser.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ConfigParser.h,v 1.3 2006/04/23 11:10:31 robertc Exp $
+ * $Id: ConfigParser.h,v 1.4 2006/04/25 12:00:29 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -38,11 +38,17 @@
 
 #include "squid.h"
 
+/**
+ * A configuration file Parser. Instances of this class track
+ * parsing state and perform tokenisation. Syntax is currently
+ * taken care of outside this class.
+ */
+
 class ConfigParser
 {
 
 public:
-    static void Destruct();
+    void destruct();
     static void ParseUShort(u_short *var);
     static void ParseBool(bool *var);
     static void ParseString(char **var);

diff --git a/src/DelayConfig.cc b/src/DelayConfig.cc
index a3d72aafc338752190ce7ee8058be1b41e143703..924bae499c06224c4514749a0bed1a819464cf3e 100644 (file)
--- a/src/DelayConfig.cc
+++ b/src/DelayConfig.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayConfig.cc,v 1.6 2003/05/20 12:17:38 robertc Exp $
+ * $Id: DelayConfig.cc,v 1.7 2006/04/25 12:00:29 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -103,7 +103,7 @@ DelayConfig::parsePoolRates()
 }
 
 void
-DelayConfig::parsePoolAccess()
+DelayConfig::parsePoolAccess(ConfigParser &parser)
 {
     ushort pool;
 
@@ -115,7 +115,7 @@ DelayConfig::parsePoolAccess()
     }
 
     --pool;
-    aclParseAccessLine(&DelayPools::delay_data[pool].access);
+    aclParseAccessLine(parser, &DelayPools::delay_data[pool].access);
 }
 
 void

diff --git a/src/DelayConfig.h b/src/DelayConfig.h
index 07a4372dc45d674c427554b0b45e9d34c3d91687..43d2f921576cfb6c86de884474e5c9bfeace9e0b 100644 (file)
--- a/src/DelayConfig.h
+++ b/src/DelayConfig.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayConfig.h,v 1.2 2003/02/21 22:50:05 robertc Exp $
+ * $Id: DelayConfig.h,v 1.3 2006/04/25 12:00:29 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -36,6 +36,8 @@
 #ifndef SQUID_DELAYCONFIG_H
 #define SQUID_DELAYCONFIG_H
 
+class ConfigParser;
+
 class DelayConfig
 {
 
@@ -45,8 +47,9 @@ public:
     void parsePoolCount();
     void parsePoolClass();
     void parsePoolRates();
-    void parsePoolAccess();
+    void parsePoolAccess(ConfigParser &parser);
     unsigned short initial;
+
 };
 
 #endif /* SQUID_DELAYCONFIG_H */

diff --git a/src/Makefile.in b/src/Makefile.in
index b44e78a3d83b6a10f7a45ac761678690269ebc35..1726e55dd0bb6a79bce9d39a37295ff2c4c9ff54 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.373 2006/04/25 00:10:46 hno Exp $
+#  $Id: Makefile.in,v 1.374 2006/04/25 12:00:29 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -54,9 +54,9 @@ check_PROGRAMS = tests/testAuth$(EXEEXT) \
 @USE_ICAP_CLIENT_TRUE@am__append_1 = ICAP
 EXTRA_PROGRAMS = DiskIO/DiskDaemon/diskd$(EXEEXT) unlinkd$(EXEEXT) \
        pinger$(EXEEXT) dnsserver$(EXEEXT) recv-announce$(EXEEXT) \
-       ufsdump$(EXEEXT) tests/testUfs$(EXEEXT) \
-       tests/testCoss$(EXEEXT) tests/testNull$(EXEEXT)
-noinst_PROGRAMS = cf_gen$(EXEEXT)
+       tests/testUfs$(EXEEXT) tests/testCoss$(EXEEXT) \
+       tests/testNull$(EXEEXT)
+noinst_PROGRAMS = cf_gen$(EXEEXT) ufsdump$(EXEEXT)
 sbin_PROGRAMS = squid$(EXEEXT)
 bin_PROGRAMS = squidclient$(EXEEXT)
 libexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) @DISK_PROGRAMS@ \
@@ -163,8 +163,8 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \
        AuthUser.cc AuthUserRequest.cc cache_cf.cc CacheDigest.cc \
        cache_manager.cc carp.cc cbdata.cc 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 ClientBody.h \
-       ClientBody.cc ClientRequestContext.h clientStream.cc \
+       client_side_request.cc client_side_request.h ClientBody.cc \
+       ClientBody.h ClientRequestContext.h clientStream.cc \
        clientStream.h comm.cc comm.h CommIO.h comm_select.cc \
        comm_poll.cc comm_epoll.cc comm_kqueue.cc CommRead.h \
        ConfigOption.cc ConfigParser.cc ConfigParser.h \
@@ -218,7 +218,7 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.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.h Server.cc \
+       StoreSwapLogData.cc StoreSwapLogData.h Server.cc Server.h \
        structs.h SwapDir.cc SwapDir.h tools.cc typedefs.h unlinkd.cc \
        url.cc urn.cc useragent.cc wais.cc wccp.cc whois.cc \
        wordlist.cc wordlist.h win32.cc
@@ -338,8 +338,10 @@ am_tests_testACLMaxUserIP_OBJECTS = acl.$(OBJEXT) \
        ETag.$(OBJEXT) HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
        HttpHdrContRange.$(OBJEXT) HttpHdrRange.$(OBJEXT) \
        HttpHdrCc.$(OBJEXT) HttpHdrSc.$(OBJEXT) \
-       HttpHdrScTarget.$(OBJEXT) Packer.$(OBJEXT) StatHist.$(OBJEXT) \
-       String.$(OBJEXT) tests/stub_cache_manager.$(OBJEXT) \
+       HttpHdrScTarget.$(OBJEXT) mem_node.$(OBJEXT) Packer.$(OBJEXT) \
+       StatHist.$(OBJEXT) stmem.$(OBJEXT) String.$(OBJEXT) \
+       tests/stub_cache_manager.$(OBJEXT) tests/stub_comm.$(OBJEXT) \
+       tests/stub_DelayId.$(OBJEXT) tests/stub_MemObject.$(OBJEXT) \
        tests/stub_store.$(OBJEXT) tests/testACLMaxUserIP.$(OBJEXT) \
        tests/testMain.$(OBJEXT) mem.$(OBJEXT) MemBuf.$(OBJEXT) \
        wordlist.$(OBJEXT) $(am__objects_25)
@@ -371,52 +373,61 @@ am_tests_testBoilerplate_OBJECTS = tests/testBoilerplate.$(OBJEXT) \
        tests/testMain.$(OBJEXT) $(am__objects_25)
 tests_testBoilerplate_OBJECTS = $(am_tests_testBoilerplate_OBJECTS)
 am__tests_testCoss_SOURCES_DIST = tests/testCoss.cc tests/testMain.cc \
-       tests/testCoss.h tests/stub_store_rebuild.cc \
-       tests/stub_internal.cc fd.cc disk.cc filemap.cc HttpBody.cc \
-       HttpReply.cc HttpStatusLine.cc int.cc list.cc MemObject.cc \
-       StoreSwapLogData.cc StoreIOState.cc StoreMeta.cc \
-       StoreMetaMD5.cc StoreMetaSTD.cc StoreMetaUnpacker.cc \
-       StoreMetaURL.cc StoreMetaVary.cc StoreFileSystem.cc \
-       store_io.cc store_swapout.cc store_swapmeta.cc unlinkd.cc \
-       ../test-suite/test_tools.cc globals.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 \
-       DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
-       DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
-       NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
-       HttpMsg.cc store_dir.cc store.cc store_key_md5.cc \
-       string_arrays.c Parsing.cc ConfigOption.cc SwapDir.cc \
-       AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc \
-       AuthConfig.cc tests/stub_acl.cc tests/stub_cache_cf.cc \
-       tests/stub_helper.cc cbdata.cc String.cc \
-       tests/stub_cache_manager.cc tests/stub_comm.cc \
-       tests/stub_http.cc mem_node.cc stmem.cc tests/stub_mime.cc \
-       tests/stub_store_client.cc tests/stub_tools.cc \
-       HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
-       acl_noncore.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
-       ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc HttpHdrScTarget.cc \
-       url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
-       StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
-       tests/stub_HttpRequest.cc tests/stub_access_log.cc wordlist.cc \
-       DiskIO/DiskIOModule.cc DiskIO/ReadRequest.cc \
-       DiskIO/ReadRequest.h DiskIO/WriteRequest.cc \
-       DiskIO/WriteRequest.h DiskIO/DiskFile.h \
+       tests/testCoss.h 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 DelaySpec.cc DelaySpec.h \
+       DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
+       DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
+       tests/stub_store_rebuild.cc tests/stub_internal.cc fd.cc \
+       disk.cc filemap.cc HttpBody.cc HttpReply.cc HttpStatusLine.cc \
+       int.cc list.cc MemObject.cc StoreSwapLogData.cc \
+       StoreIOState.cc StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
+       StoreMetaUnpacker.cc StoreMetaURL.cc StoreMetaVary.cc \
+       StoreFileSystem.cc store_io.cc store_swapout.cc \
+       store_swapmeta.cc unlinkd.cc DiskIO/DiskIOModule.cc \
+       DiskIO/ReadRequest.cc DiskIO/ReadRequest.h \
+       DiskIO/WriteRequest.cc DiskIO/WriteRequest.h DiskIO/DiskFile.h \
        DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \
-       DiskIO/DiskIOModule.h
-am__objects_26 = $(am__objects_25) $(am__objects_5) \
-       CacheDigest.$(OBJEXT) ConfigParser.$(OBJEXT) HttpMsg.$(OBJEXT) \
-       store_dir.$(OBJEXT) store.$(OBJEXT) store_key_md5.$(OBJEXT) \
-       string_arrays.$(OBJEXT) Parsing.$(OBJEXT) \
-       ConfigOption.$(OBJEXT) SwapDir.$(OBJEXT) AuthScheme.$(OBJEXT) \
-       authenticate.$(OBJEXT) AuthUser.$(OBJEXT) \
+       DiskIO/DiskIOModule.h ../test-suite/test_tools.cc globals.cc \
+       CacheDigest.cc ConfigParser.cc HttpMsg.cc store_dir.cc \
+       store.cc store_key_md5.cc string_arrays.c Parsing.cc \
+       ConfigOption.cc SwapDir.cc AuthScheme.cc authenticate.cc \
+       AuthUser.cc AuthUserRequest.cc AuthConfig.cc tests/stub_acl.cc \
+       tests/stub_cache_cf.cc tests/stub_helper.cc cbdata.cc \
+       String.cc tests/stub_cache_manager.cc tests/stub_comm.cc \
+       tests/stub_client_side_request.cc tests/stub_http.cc \
+       mem_node.cc stmem.cc tests/stub_mime.cc HttpHeaderTools.cc \
+       HttpHeader.cc acl.cc event.cc mem.cc acl_noncore.cc MemBuf.cc \
+       HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc \
+       HttpHdrSc.cc HttpHdrScTarget.cc url.cc ACLProxyAuth.cc \
+       ACLRegexData.cc ACLUserData.cc StatHist.cc HttpHdrRange.cc \
+       ETag.cc tests/stub_errorpage.cc tests/stub_HttpRequest.cc \
+       tests/stub_access_log.cc refresh.cc tests/stub_store_client.cc \
+       tests/stub_tools.cc wordlist.cc
+am__objects_26 = $(am__objects_5) tests/stub_store_rebuild.$(OBJEXT) \
+       tests/stub_internal.$(OBJEXT) fd.$(OBJEXT) disk.$(OBJEXT) \
+       filemap.$(OBJEXT) HttpBody.$(OBJEXT) HttpReply.$(OBJEXT) \
+       HttpStatusLine.$(OBJEXT) int.$(OBJEXT) list.$(OBJEXT) \
+       MemObject.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
+       StoreIOState.$(OBJEXT) StoreMeta.$(OBJEXT) \
+       StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
+       StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
+       StoreMetaVary.$(OBJEXT) StoreFileSystem.$(OBJEXT) \
+       store_io.$(OBJEXT) store_swapout.$(OBJEXT) \
+       store_swapmeta.$(OBJEXT) unlinkd.$(OBJEXT) $(am__objects_6) \
+       $(am__objects_25) CacheDigest.$(OBJEXT) ConfigParser.$(OBJEXT) \
+       HttpMsg.$(OBJEXT) store_dir.$(OBJEXT) store.$(OBJEXT) \
+       store_key_md5.$(OBJEXT) string_arrays.$(OBJEXT) \
+       Parsing.$(OBJEXT) ConfigOption.$(OBJEXT) SwapDir.$(OBJEXT) \
+       AuthScheme.$(OBJEXT) authenticate.$(OBJEXT) AuthUser.$(OBJEXT) \
        AuthUserRequest.$(OBJEXT) AuthConfig.$(OBJEXT) \
        tests/stub_acl.$(OBJEXT) tests/stub_cache_cf.$(OBJEXT) \
        tests/stub_helper.$(OBJEXT) cbdata.$(OBJEXT) String.$(OBJEXT) \
        tests/stub_cache_manager.$(OBJEXT) tests/stub_comm.$(OBJEXT) \
+       tests/stub_client_side_request.$(OBJEXT) \
        tests/stub_http.$(OBJEXT) mem_node.$(OBJEXT) stmem.$(OBJEXT) \
-       tests/stub_mime.$(OBJEXT) tests/stub_store_client.$(OBJEXT) \
-       tests/stub_tools.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
+       tests/stub_mime.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
        HttpHeader.$(OBJEXT) acl.$(OBJEXT) event.$(OBJEXT) \
        mem.$(OBJEXT) acl_noncore.$(OBJEXT) MemBuf.$(OBJEXT) \
        HttpHdrContRange.$(OBJEXT) Packer.$(OBJEXT) \
@@ -426,78 +437,67 @@ am__objects_26 = $(am__objects_25) $(am__objects_5) \
        StatHist.$(OBJEXT) HttpHdrRange.$(OBJEXT) ETag.$(OBJEXT) \
        tests/stub_errorpage.$(OBJEXT) \
        tests/stub_HttpRequest.$(OBJEXT) \
-       tests/stub_access_log.$(OBJEXT) wordlist.$(OBJEXT)
-am__objects_27 = tests/stub_store_rebuild.$(OBJEXT) \
-       tests/stub_internal.$(OBJEXT) fd.$(OBJEXT) disk.$(OBJEXT) \
-       filemap.$(OBJEXT) HttpBody.$(OBJEXT) HttpReply.$(OBJEXT) \
-       HttpStatusLine.$(OBJEXT) int.$(OBJEXT) list.$(OBJEXT) \
-       MemObject.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
-       StoreIOState.$(OBJEXT) StoreMeta.$(OBJEXT) \
-       StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
-       StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
-       StoreMetaVary.$(OBJEXT) StoreFileSystem.$(OBJEXT) \
-       store_io.$(OBJEXT) store_swapout.$(OBJEXT) \
-       store_swapmeta.$(OBJEXT) unlinkd.$(OBJEXT) $(am__objects_26) \
-       $(am__objects_6)
+       tests/stub_access_log.$(OBJEXT) refresh.$(OBJEXT) \
+       tests/stub_store_client.$(OBJEXT) tests/stub_tools.$(OBJEXT) \
+       wordlist.$(OBJEXT)
 am_tests_testCoss_OBJECTS = tests/testCoss.$(OBJEXT) \
-       tests/testMain.$(OBJEXT) $(am__objects_27)
+       tests/testMain.$(OBJEXT) $(am__objects_26)
 tests_testCoss_OBJECTS = $(am_tests_testCoss_OBJECTS)
 am__DEPENDENCIES_2 = DiskIO/Blocking/BlockingDiskIOModule.o \
        repl/lru/store_repl_lru.o
-am__objects_28 = tests/testHeader_ACL.$(OBJEXT) \
+am__objects_27 = tests/testHeader_ACL.$(OBJEXT) \
        tests/testHeader_ConfigParser.$(OBJEXT) \
+       tests/testHeader_client_side_request.$(OBJEXT) \
        tests/testHeader_dlink.$(OBJEXT) \
        tests/testHeader_HttpHeader.$(OBJEXT) \
        tests/testHeader_HttpHeaderRange.$(OBJEXT) \
        tests/testHeader_HttpReply.$(OBJEXT) \
        tests/testHeader_wordlist.$(OBJEXT)
 am_tests_testHeaders_OBJECTS = tests/testMain.$(OBJEXT) \
-       $(am__objects_28)
+       $(am__objects_27)
 tests_testHeaders_OBJECTS = $(am_tests_testHeaders_OBJECTS)
 am__tests_testNull_SOURCES_DIST = tests/testNull.cc tests/testMain.cc \
-       tests/testNull.h tests/stub_store_rebuild.cc \
-       tests/stub_internal.cc fd.cc disk.cc filemap.cc HttpBody.cc \
-       HttpReply.cc HttpStatusLine.cc int.cc list.cc MemObject.cc \
-       StoreSwapLogData.cc StoreIOState.cc StoreMeta.cc \
-       StoreMetaMD5.cc StoreMetaSTD.cc StoreMetaUnpacker.cc \
-       StoreMetaURL.cc StoreMetaVary.cc StoreFileSystem.cc \
-       store_io.cc store_swapout.cc store_swapmeta.cc unlinkd.cc \
-       ../test-suite/test_tools.cc globals.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 \
-       DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
-       DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
-       NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
-       HttpMsg.cc store_dir.cc store.cc store_key_md5.cc \
-       string_arrays.c Parsing.cc ConfigOption.cc SwapDir.cc \
-       AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc \
-       AuthConfig.cc tests/stub_acl.cc tests/stub_cache_cf.cc \
-       tests/stub_helper.cc cbdata.cc String.cc \
-       tests/stub_cache_manager.cc tests/stub_comm.cc \
-       tests/stub_http.cc mem_node.cc stmem.cc tests/stub_mime.cc \
-       tests/stub_store_client.cc tests/stub_tools.cc \
-       HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
-       acl_noncore.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
-       ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc HttpHdrScTarget.cc \
-       url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
-       StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
-       tests/stub_HttpRequest.cc tests/stub_access_log.cc wordlist.cc \
-       DiskIO/DiskIOModule.cc DiskIO/ReadRequest.cc \
-       DiskIO/ReadRequest.h DiskIO/WriteRequest.cc \
-       DiskIO/WriteRequest.h DiskIO/DiskFile.h \
+       tests/testNull.h 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 DelaySpec.cc DelaySpec.h \
+       DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
+       DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
+       tests/stub_store_rebuild.cc tests/stub_internal.cc fd.cc \
+       disk.cc filemap.cc HttpBody.cc HttpReply.cc HttpStatusLine.cc \
+       int.cc list.cc MemObject.cc StoreSwapLogData.cc \
+       StoreIOState.cc StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
+       StoreMetaUnpacker.cc StoreMetaURL.cc StoreMetaVary.cc \
+       StoreFileSystem.cc store_io.cc store_swapout.cc \
+       store_swapmeta.cc unlinkd.cc DiskIO/DiskIOModule.cc \
+       DiskIO/ReadRequest.cc DiskIO/ReadRequest.h \
+       DiskIO/WriteRequest.cc DiskIO/WriteRequest.h DiskIO/DiskFile.h \
        DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \
-       DiskIO/DiskIOModule.h
+       DiskIO/DiskIOModule.h ../test-suite/test_tools.cc globals.cc \
+       CacheDigest.cc ConfigParser.cc HttpMsg.cc store_dir.cc \
+       store.cc store_key_md5.cc string_arrays.c Parsing.cc \
+       ConfigOption.cc SwapDir.cc AuthScheme.cc authenticate.cc \
+       AuthUser.cc AuthUserRequest.cc AuthConfig.cc tests/stub_acl.cc \
+       tests/stub_cache_cf.cc tests/stub_helper.cc cbdata.cc \
+       String.cc tests/stub_cache_manager.cc tests/stub_comm.cc \
+       tests/stub_client_side_request.cc tests/stub_http.cc \
+       mem_node.cc stmem.cc tests/stub_mime.cc HttpHeaderTools.cc \
+       HttpHeader.cc acl.cc event.cc mem.cc acl_noncore.cc MemBuf.cc \
+       HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc \
+       HttpHdrSc.cc HttpHdrScTarget.cc url.cc ACLProxyAuth.cc \
+       ACLRegexData.cc ACLUserData.cc StatHist.cc HttpHdrRange.cc \
+       ETag.cc tests/stub_errorpage.cc tests/stub_HttpRequest.cc \
+       tests/stub_access_log.cc refresh.cc tests/stub_store_client.cc \
+       tests/stub_tools.cc wordlist.cc
 am_tests_testNull_OBJECTS = tests/testNull.$(OBJEXT) \
-       tests/testMain.$(OBJEXT) $(am__objects_27)
+       tests/testMain.$(OBJEXT) $(am__objects_26)
 tests_testNull_OBJECTS = $(am_tests_testNull_OBJECTS)
-am__tests_testStore_SOURCES_DIST = tests/testStore.cc \
-       tests/testStoreController.cc tests/testStoreHashIndex.cc \
-       tests/testMain.cc tests/testStore.h \
-       tests/testStoreController.h tests/testStoreHashIndex.h \
-       tests/TestSwapDir.cc tests/TestSwapDir.h \
-       tests/stub_store_swapout.cc tests/stub_fd.cc \
-       tests/stub_HttpReply.cc tests/stub_MemObject.cc \
+am__tests_testStore_SOURCES_DIST = tests/stub_store_swapout.cc \
+       tests/testMain.cc tests/stub_MemObject.cc tests/testStore.cc \
+       tests/testStore.h tests/testStoreController.cc \
+       tests/testStoreController.h tests/testStoreHashIndex.cc \
+       tests/testStoreHashIndex.h tests/TestSwapDir.cc \
+       tests/TestSwapDir.h tests/stub_fd.cc tests/stub_HttpReply.cc \
        ../test-suite/test_tools.cc globals.cc CommonPool.h \
        CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
        DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
@@ -511,65 +511,91 @@ am__tests_testStore_SOURCES_DIST = tests/testStore.cc \
        AuthConfig.cc tests/stub_acl.cc tests/stub_cache_cf.cc \
        tests/stub_helper.cc cbdata.cc String.cc \
        tests/stub_cache_manager.cc tests/stub_comm.cc \
-       tests/stub_http.cc mem_node.cc stmem.cc tests/stub_mime.cc \
-       tests/stub_store_client.cc tests/stub_tools.cc \
-       HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
-       acl_noncore.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
-       ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc HttpHdrScTarget.cc \
-       url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
-       StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
-       tests/stub_HttpRequest.cc tests/stub_access_log.cc wordlist.cc
-am_tests_testStore_OBJECTS = tests/testStore.$(OBJEXT) \
-       tests/testStoreController.$(OBJEXT) \
-       tests/testStoreHashIndex.$(OBJEXT) tests/testMain.$(OBJEXT) \
-       tests/TestSwapDir.$(OBJEXT) tests/stub_store_swapout.$(OBJEXT) \
+       tests/stub_client_side_request.cc tests/stub_http.cc \
+       mem_node.cc stmem.cc tests/stub_mime.cc HttpHeaderTools.cc \
+       HttpHeader.cc acl.cc event.cc mem.cc acl_noncore.cc MemBuf.cc \
+       HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc \
+       HttpHdrSc.cc HttpHdrScTarget.cc url.cc ACLProxyAuth.cc \
+       ACLRegexData.cc ACLUserData.cc StatHist.cc HttpHdrRange.cc \
+       ETag.cc tests/stub_errorpage.cc tests/stub_HttpRequest.cc \
+       tests/stub_access_log.cc refresh.cc tests/stub_store_client.cc \
+       tests/stub_tools.cc wordlist.cc
+am__objects_28 = $(am__objects_25) $(am__objects_5) \
+       CacheDigest.$(OBJEXT) ConfigParser.$(OBJEXT) HttpMsg.$(OBJEXT) \
+       store_dir.$(OBJEXT) store.$(OBJEXT) store_key_md5.$(OBJEXT) \
+       string_arrays.$(OBJEXT) Parsing.$(OBJEXT) \
+       ConfigOption.$(OBJEXT) SwapDir.$(OBJEXT) AuthScheme.$(OBJEXT) \
+       authenticate.$(OBJEXT) AuthUser.$(OBJEXT) \
+       AuthUserRequest.$(OBJEXT) AuthConfig.$(OBJEXT) \
+       tests/stub_acl.$(OBJEXT) tests/stub_cache_cf.$(OBJEXT) \
+       tests/stub_helper.$(OBJEXT) cbdata.$(OBJEXT) String.$(OBJEXT) \
+       tests/stub_cache_manager.$(OBJEXT) tests/stub_comm.$(OBJEXT) \
+       tests/stub_client_side_request.$(OBJEXT) \
+       tests/stub_http.$(OBJEXT) mem_node.$(OBJEXT) stmem.$(OBJEXT) \
+       tests/stub_mime.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
+       HttpHeader.$(OBJEXT) acl.$(OBJEXT) event.$(OBJEXT) \
+       mem.$(OBJEXT) acl_noncore.$(OBJEXT) MemBuf.$(OBJEXT) \
+       HttpHdrContRange.$(OBJEXT) Packer.$(OBJEXT) \
+       ACLChecklist.$(OBJEXT) HttpHdrCc.$(OBJEXT) HttpHdrSc.$(OBJEXT) \
+       HttpHdrScTarget.$(OBJEXT) url.$(OBJEXT) ACLProxyAuth.$(OBJEXT) \
+       ACLRegexData.$(OBJEXT) ACLUserData.$(OBJEXT) \
+       StatHist.$(OBJEXT) HttpHdrRange.$(OBJEXT) ETag.$(OBJEXT) \
+       tests/stub_errorpage.$(OBJEXT) \
+       tests/stub_HttpRequest.$(OBJEXT) \
+       tests/stub_access_log.$(OBJEXT) refresh.$(OBJEXT) \
+       tests/stub_store_client.$(OBJEXT) tests/stub_tools.$(OBJEXT) \
+       wordlist.$(OBJEXT)
+am_tests_testStore_OBJECTS = tests/stub_store_swapout.$(OBJEXT) \
+       tests/testMain.$(OBJEXT) tests/stub_MemObject.$(OBJEXT) \
+       tests/testStore.$(OBJEXT) tests/testStoreController.$(OBJEXT) \
+       tests/testStoreHashIndex.$(OBJEXT) tests/TestSwapDir.$(OBJEXT) \
        tests/stub_fd.$(OBJEXT) tests/stub_HttpReply.$(OBJEXT) \
-       tests/stub_MemObject.$(OBJEXT) $(am__objects_26)
+       $(am__objects_28)
 tests_testStore_OBJECTS = $(am_tests_testStore_OBJECTS)
 am__tests_testUfs_SOURCES_DIST = tests/testUfs.cc tests/testMain.cc \
-       tests/testUfs.h tests/stub_store_rebuild.cc \
-       tests/stub_internal.cc fd.cc disk.cc filemap.cc HttpBody.cc \
-       HttpReply.cc HttpStatusLine.cc int.cc list.cc MemObject.cc \
-       StoreSwapLogData.cc StoreIOState.cc StoreMeta.cc \
-       StoreMetaMD5.cc StoreMetaSTD.cc StoreMetaUnpacker.cc \
-       StoreMetaURL.cc StoreMetaVary.cc StoreFileSystem.cc \
-       store_io.cc store_swapout.cc store_swapmeta.cc unlinkd.cc \
-       ../test-suite/test_tools.cc globals.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 \
-       DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
-       DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
-       NullDelayId.cc NullDelayId.h CacheDigest.cc ConfigParser.cc \
-       HttpMsg.cc store_dir.cc store.cc store_key_md5.cc \
-       string_arrays.c Parsing.cc ConfigOption.cc SwapDir.cc \
-       AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc \
-       AuthConfig.cc tests/stub_acl.cc tests/stub_cache_cf.cc \
-       tests/stub_helper.cc cbdata.cc String.cc \
-       tests/stub_cache_manager.cc tests/stub_comm.cc \
-       tests/stub_http.cc mem_node.cc stmem.cc tests/stub_mime.cc \
-       tests/stub_store_client.cc tests/stub_tools.cc \
-       HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
-       acl_noncore.cc MemBuf.cc HttpHdrContRange.cc Packer.cc \
-       ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc HttpHdrScTarget.cc \
-       url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
-       StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
-       tests/stub_HttpRequest.cc tests/stub_access_log.cc wordlist.cc \
-       DiskIO/DiskIOModule.cc DiskIO/ReadRequest.cc \
-       DiskIO/ReadRequest.h DiskIO/WriteRequest.cc \
-       DiskIO/WriteRequest.h DiskIO/DiskFile.h \
+       tests/testUfs.h 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 DelaySpec.cc DelaySpec.h \
+       DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
+       DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
+       tests/stub_store_rebuild.cc tests/stub_internal.cc fd.cc \
+       disk.cc filemap.cc HttpBody.cc HttpReply.cc HttpStatusLine.cc \
+       int.cc list.cc MemObject.cc StoreSwapLogData.cc \
+       StoreIOState.cc StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
+       StoreMetaUnpacker.cc StoreMetaURL.cc StoreMetaVary.cc \
+       StoreFileSystem.cc store_io.cc store_swapout.cc \
+       store_swapmeta.cc unlinkd.cc DiskIO/DiskIOModule.cc \
+       DiskIO/ReadRequest.cc DiskIO/ReadRequest.h \
+       DiskIO/WriteRequest.cc DiskIO/WriteRequest.h DiskIO/DiskFile.h \
        DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \
-       DiskIO/DiskIOModule.h
+       DiskIO/DiskIOModule.h ../test-suite/test_tools.cc globals.cc \
+       CacheDigest.cc ConfigParser.cc HttpMsg.cc store_dir.cc \
+       store.cc store_key_md5.cc string_arrays.c Parsing.cc \
+       ConfigOption.cc SwapDir.cc AuthScheme.cc authenticate.cc \
+       AuthUser.cc AuthUserRequest.cc AuthConfig.cc tests/stub_acl.cc \
+       tests/stub_cache_cf.cc tests/stub_helper.cc cbdata.cc \
+       String.cc tests/stub_cache_manager.cc tests/stub_comm.cc \
+       tests/stub_client_side_request.cc tests/stub_http.cc \
+       mem_node.cc stmem.cc tests/stub_mime.cc HttpHeaderTools.cc \
+       HttpHeader.cc acl.cc event.cc mem.cc acl_noncore.cc MemBuf.cc \
+       HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc \
+       HttpHdrSc.cc HttpHdrScTarget.cc url.cc ACLProxyAuth.cc \
+       ACLRegexData.cc ACLUserData.cc StatHist.cc HttpHdrRange.cc \
+       ETag.cc tests/stub_errorpage.cc tests/stub_HttpRequest.cc \
+       tests/stub_access_log.cc refresh.cc tests/stub_store_client.cc \
+       tests/stub_tools.cc wordlist.cc
 am_tests_testUfs_OBJECTS = tests/testUfs.$(OBJEXT) \
-       tests/testMain.$(OBJEXT) $(am__objects_27)
+       tests/testMain.$(OBJEXT) $(am__objects_26)
 tests_testUfs_OBJECTS = $(am_tests_testUfs_OBJECTS)
-am__ufsdump_SOURCES_DIST = debug.cc int.cc ufsdump.cc store.cc \
-       StoreFileSystem.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 \
-       StoreSwapLogData.cc StoreSwapLogData.h access_log.cc acl.cc \
-       ACLChecklist.cc ACLProxyAuth.cc ACLUserData.cc ACLRegexData.cc \
+am__ufsdump_SOURCES_DIST = ClientBody.cc ConfigParser.cc debug.cc \
+       int.cc ufsdump.cc store.cc StoreFileSystem.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 StoreSwapLogData.cc StoreSwapLogData.h \
+       access_log.cc acl.cc acl_noncore.cc ACLChecklist.cc \
+       ACLProxyAuth.cc ACLUserData.cc ACLRegexData.cc \
        ACLStringData.cc authenticate.cc AuthUser.cc \
        AuthUserRequest.cc AuthScheme.cc AuthConfig.cc cache_cf.cc \
        CacheDigest.cc cache_manager.cc carp.cc cbdata.cc client_db.cc \
@@ -607,26 +633,27 @@ am__ufsdump_SOURCES_DIST = debug.cc int.cc ufsdump.cc store.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 \
-       SquidNew.cc stat.cc StatHist.cc String.cc stmem.cc store_io.cc \
-       StoreIOBuffer.h StoreIOState.cc 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 structs.h SwapDir.cc tools.cc typedefs.h \
-       unlinkd.cc url.cc urn.cc useragent.cc wais.cc wccp.cc whois.cc \
-       win32.cc
-am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) ufsdump.$(OBJEXT) \
+       Server.cc SquidNew.cc stat.cc StatHist.cc String.cc stmem.cc \
+       store_io.cc StoreIOBuffer.h StoreIOState.cc 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 structs.h SwapDir.cc \
+       tools.cc typedefs.h unlinkd.cc url.cc urn.cc useragent.cc \
+       wais.cc wccp.cc whois.cc wordlist.cc win32.cc
+am_ufsdump_OBJECTS = ClientBody.$(OBJEXT) ConfigParser.$(OBJEXT) \
+       debug.$(OBJEXT) int.$(OBJEXT) ufsdump.$(OBJEXT) \
        store.$(OBJEXT) StoreFileSystem.$(OBJEXT) StoreMeta.$(OBJEXT) \
        StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
        StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
        StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
-       access_log.$(OBJEXT) acl.$(OBJEXT) ACLChecklist.$(OBJEXT) \
-       ACLProxyAuth.$(OBJEXT) ACLUserData.$(OBJEXT) \
-       ACLRegexData.$(OBJEXT) ACLStringData.$(OBJEXT) \
-       authenticate.$(OBJEXT) AuthUser.$(OBJEXT) \
-       AuthUserRequest.$(OBJEXT) AuthScheme.$(OBJEXT) \
-       AuthConfig.$(OBJEXT) cache_cf.$(OBJEXT) CacheDigest.$(OBJEXT) \
-       cache_manager.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
-       client_db.$(OBJEXT) client_side.$(OBJEXT) \
+       access_log.$(OBJEXT) acl.$(OBJEXT) acl_noncore.$(OBJEXT) \
+       ACLChecklist.$(OBJEXT) ACLProxyAuth.$(OBJEXT) \
+       ACLUserData.$(OBJEXT) ACLRegexData.$(OBJEXT) \
+       ACLStringData.$(OBJEXT) authenticate.$(OBJEXT) \
+       AuthUser.$(OBJEXT) AuthUserRequest.$(OBJEXT) \
+       AuthScheme.$(OBJEXT) AuthConfig.$(OBJEXT) cache_cf.$(OBJEXT) \
+       CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \
+       cbdata.$(OBJEXT) client_db.$(OBJEXT) client_side.$(OBJEXT) \
        client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \
        clientStream.$(OBJEXT) comm.$(OBJEXT) comm_select.$(OBJEXT) \
        comm_poll.$(OBJEXT) comm_epoll.$(OBJEXT) comm_kqueue.$(OBJEXT) \
@@ -652,16 +679,17 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) ufsdump.$(OBJEXT) \
        peer_digest.$(OBJEXT) peer_select.$(OBJEXT) redirect.$(OBJEXT) \
        referer.$(OBJEXT) refresh.$(OBJEXT) send-announce.$(OBJEXT) \
        $(am__objects_16) $(am__objects_18) tunnel.$(OBJEXT) \
-       SquidNew.$(OBJEXT) stat.$(OBJEXT) StatHist.$(OBJEXT) \
-       String.$(OBJEXT) stmem.$(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) \
-       SwapDir.$(OBJEXT) tools.$(OBJEXT) $(am__objects_19) \
-       url.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) \
-       wccp.$(OBJEXT) whois.$(OBJEXT) $(am__objects_21)
+       Server.$(OBJEXT) SquidNew.$(OBJEXT) stat.$(OBJEXT) \
+       StatHist.$(OBJEXT) String.$(OBJEXT) stmem.$(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) SwapDir.$(OBJEXT) tools.$(OBJEXT) \
+       $(am__objects_19) url.$(OBJEXT) urn.$(OBJEXT) \
+       useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \
+       whois.$(OBJEXT) wordlist.$(OBJEXT) $(am__objects_21)
 nodist_ufsdump_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \
        string_arrays.$(OBJEXT)
 ufsdump_OBJECTS = $(am_ufsdump_OBJECTS) $(nodist_ufsdump_OBJECTS)
@@ -1207,8 +1235,8 @@ squid_SOURCES = \
        client_side_reply.h \
        client_side_request.cc \
        client_side_request.h \
-       ClientBody.h \
        ClientBody.cc \
+       ClientBody.h \
        ClientRequestContext.h \
        clientStream.cc \
        clientStream.h \
@@ -1367,8 +1395,8 @@ squid_SOURCES = \
        StoreSearch.h \
        StoreSwapLogData.cc \
        StoreSwapLogData.h \
-       Server.h \
        Server.cc \
+       Server.h \
        structs.h \
        SwapDir.cc \
        SwapDir.h \
@@ -1440,7 +1468,10 @@ pinger_SOURCES = \
 
 dnsserver_SOURCES = dnsserver.cc SquidNew.cc
 recv_announce_SOURCES = recv-announce.cc SquidNew.cc
-ufsdump_SOURCES = debug.cc \
+ufsdump_SOURCES = \
+       ClientBody.cc \
+       ConfigParser.cc \
+       debug.cc \
        int.cc \
        ufsdump.cc \
        store.cc \
@@ -1461,6 +1492,7 @@ ufsdump_SOURCES = debug.cc \
        StoreSwapLogData.h \
        access_log.cc \
        acl.cc \
+       acl_noncore.cc \
        ACLChecklist.cc \
        ACLProxyAuth.cc \
        ACLUserData.cc \
@@ -1565,6 +1597,7 @@ ufsdump_SOURCES = debug.cc \
        squid.h \
        $(SSL_SOURCE) \
        tunnel.cc \
+       Server.cc \
        SquidNew.cc \
        stat.cc \
        StatHist.cc \
@@ -1594,6 +1627,7 @@ ufsdump_SOURCES = debug.cc \
        wais.cc \
        wccp.cc \
        whois.cc \
+       wordlist.cc \
        $(WIN32_SOURCE)
 
 ufsdump_LDADD = \
@@ -1776,10 +1810,15 @@ tests_testACLMaxUserIP_SOURCES = \
        HttpHdrCc.cc \
        HttpHdrSc.cc \
        HttpHdrScTarget.cc \
+       mem_node.cc \
        Packer.cc \
        StatHist.cc \
+       stmem.cc \
        String.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_comm.cc \
+       tests/stub_DelayId.cc \
+       tests/stub_MemObject.cc \
        tests/stub_store.cc \
        tests/testACLMaxUserIP.cc \
        tests/testACLMaxUserIP.h \
@@ -1812,6 +1851,7 @@ tests_testBoilerplate_DEPENDENCIES = \
 HEADERS_TO_TEST = \
        tests/testHeader_ACL.cc \
        tests/testHeader_ConfigParser.cc \
+       tests/testHeader_client_side_request.cc \
        tests/testHeader_dlink.cc \
        tests/testHeader_HttpHeader.cc \
        tests/testHeader_HttpHeaderRange.cc \
@@ -1829,6 +1869,7 @@ tests_testHeaders_DEPENDENCIES = \
 
 
 # TODO:mime.cc drags in HttpReply.cc
+# delay pools need client_side_request.cc
 STORE_TEST_SOURCES = \
        $(TESTSOURCES) \
        $(DELAY_POOL_SOURCE) \
@@ -1846,33 +1887,36 @@ STORE_TEST_SOURCES = \
        tests/stub_acl.cc tests/stub_cache_cf.cc \
        tests/stub_helper.cc cbdata.cc String.cc tests/stub_cache_manager.cc \
        tests/stub_comm.cc \
+       tests/stub_client_side_request.cc \
        tests/stub_http.cc \
        mem_node.cc \
        stmem.cc \
        tests/stub_mime.cc \
-       tests/stub_store_client.cc \
-       tests/stub_tools.cc \
        HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
        acl_noncore.cc \
        MemBuf.cc HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc \
        HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
        StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
        tests/stub_HttpRequest.cc tests/stub_access_log.cc \
+       refresh.cc \
+       tests/stub_store_client.cc \
+       tests/stub_tools.cc \
        wordlist.cc
 
-tests_testStore_SOURCES = tests/testStore.cc \
-       tests/testStoreController.cc \
-       tests/testStoreHashIndex.cc \
+tests_testStore_SOURCES = \
+       tests/stub_store_swapout.cc \
        tests/testMain.cc \
+       tests/stub_MemObject.cc \
+       tests/testStore.cc \
        tests/testStore.h \
+       tests/testStoreController.cc \
        tests/testStoreController.h \
+       tests/testStoreHashIndex.cc \
        tests/testStoreHashIndex.h \
        tests/TestSwapDir.cc \
        tests/TestSwapDir.h \
-       tests/stub_store_swapout.cc \
        tests/stub_fd.cc \
        tests/stub_HttpReply.cc \
-       tests/stub_MemObject.cc \
        $(STORE_TEST_SOURCES)
 
 tests_testStore_LDADD = \
@@ -1885,7 +1929,11 @@ tests_testStore_LDFLAGS = $(LIBADD_DL)
 tests_testStore_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
        @SQUID_CPPUNIT_LA@
 
+
+# store depends on delay pools - linked in by 
+#$(STORE_TEST_SOURCES)
 SWAP_TEST_SOURCES = \
+       $(DELAY_POOL_SOURCE) \
        tests/stub_store_rebuild.cc \
        tests/stub_internal.cc \
        fd.cc \
@@ -1910,8 +1958,37 @@ SWAP_TEST_SOURCES = \
        store_swapout.cc \
        store_swapmeta.cc \
        unlinkd.cc \
-       $(STORE_TEST_SOURCES) \
-       $(DISKIO_SOURCE)
+       $(DISKIO_SOURCE) \
+       $(TESTSOURCES) \
+       CacheDigest.cc \
+       ConfigParser.cc \
+       HttpMsg.cc \
+       store_dir.cc \
+       store.cc \
+       store_key_md5.cc \
+       string_arrays.c \
+       Parsing.cc \
+       ConfigOption.cc \
+       SwapDir.cc \
+       AuthScheme.cc authenticate.cc AuthUser.cc AuthUserRequest.cc AuthConfig.cc \
+       tests/stub_acl.cc tests/stub_cache_cf.cc \
+       tests/stub_helper.cc cbdata.cc String.cc tests/stub_cache_manager.cc \
+       tests/stub_comm.cc \
+       tests/stub_client_side_request.cc \
+       tests/stub_http.cc \
+       mem_node.cc \
+       stmem.cc \
+       tests/stub_mime.cc \
+       HttpHeaderTools.cc HttpHeader.cc acl.cc event.cc mem.cc \
+       acl_noncore.cc \
+       MemBuf.cc HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc \
+       HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
+       StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
+       tests/stub_HttpRequest.cc tests/stub_access_log.cc \
+       refresh.cc \
+       tests/stub_store_client.cc \
+       tests/stub_tools.cc \
+       wordlist.cc
 
 SWAP_TEST_LDADD = \
        DiskIO/Blocking/BlockingDiskIOModule.o \
@@ -2307,6 +2384,12 @@ tests/$(DEPDIR)/$(am__dirstamp):
        @: > tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_cache_manager.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
+tests/stub_comm.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
+tests/stub_DelayId.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
+tests/stub_MemObject.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_store.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/testACLMaxUserIP.$(OBJEXT): tests/$(am__dirstamp) \
@@ -2336,12 +2419,6 @@ tests/stub_errorpage.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_HttpRequest.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
-tests/stub_DelayId.$(OBJEXT): tests/$(am__dirstamp) \
-       tests/$(DEPDIR)/$(am__dirstamp)
-tests/stub_MemObject.$(OBJEXT): tests/$(am__dirstamp) \
-       tests/$(DEPDIR)/$(am__dirstamp)
-tests/stub_comm.$(OBJEXT): tests/$(am__dirstamp) \
-       tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_http.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_mime.$(OBJEXT): tests/$(am__dirstamp) \
@@ -2362,6 +2439,8 @@ tests/stub_store_rebuild.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_internal.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
+tests/stub_client_side_request.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_store_client.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_tools.$(OBJEXT): tests/$(am__dirstamp) \
@@ -2373,6 +2452,8 @@ tests/testHeader_ACL.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_ConfigParser.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
+tests/testHeader_client_side_request.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_dlink.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/testHeader_HttpHeader.$(OBJEXT): tests/$(am__dirstamp) \
@@ -2391,6 +2472,8 @@ tests/testNull.$(OBJEXT): tests/$(am__dirstamp) \
 tests/testNull$(EXEEXT): $(tests_testNull_OBJECTS) $(tests_testNull_DEPENDENCIES) tests/$(am__dirstamp)
        @rm -f tests/testNull$(EXEEXT)
        $(CXXLINK) $(tests_testNull_LDFLAGS) $(tests_testNull_OBJECTS) $(tests_testNull_LDADD) $(LIBS)
+tests/stub_store_swapout.$(OBJEXT): tests/$(am__dirstamp) \
+       tests/$(DEPDIR)/$(am__dirstamp)
 tests/testStore.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/testStoreController.$(OBJEXT): tests/$(am__dirstamp) \
@@ -2399,8 +2482,6 @@ tests/testStoreHashIndex.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/TestSwapDir.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
-tests/stub_store_swapout.$(OBJEXT): tests/$(am__dirstamp) \
-       tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_fd.$(OBJEXT): tests/$(am__dirstamp) \
        tests/$(DEPDIR)/$(am__dirstamp)
 tests/stub_HttpReply.$(OBJEXT): tests/$(am__dirstamp) \
@@ -2459,6 +2540,7 @@ mostlyclean-compile:
        -rm -f tests/stub_acl.$(OBJEXT)
        -rm -f tests/stub_cache_cf.$(OBJEXT)
        -rm -f tests/stub_cache_manager.$(OBJEXT)
+       -rm -f tests/stub_client_side_request.$(OBJEXT)
        -rm -f tests/stub_comm.$(OBJEXT)
        -rm -f tests/stub_errorpage.$(OBJEXT)
        -rm -f tests/stub_fd.$(OBJEXT)
@@ -2480,6 +2562,7 @@ mostlyclean-compile:
        -rm -f tests/testHeader_HttpHeader.$(OBJEXT)
        -rm -f tests/testHeader_HttpHeaderRange.$(OBJEXT)
        -rm -f tests/testHeader_HttpReply.$(OBJEXT)
+       -rm -f tests/testHeader_client_side_request.$(OBJEXT)
        -rm -f tests/testHeader_dlink.$(OBJEXT)
        -rm -f tests/testHeader_wordlist.$(OBJEXT)
        -rm -f tests/testMain.$(OBJEXT)
@@ -2730,6 +2813,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_acl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_cache_cf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_cache_manager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_client_side_request.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_comm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_errorpage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/stub_fd.Po@am__quote@
@@ -2751,6 +2835,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testHeader_HttpHeader.Po@am__quote@
 @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_client_side_request.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_wordlist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/testMain.Po@am__quote@

diff --git a/src/acl.cc b/src/acl.cc
index 3964ca5af4ed3f3f9c0e432e9b37c644a1513cb2..759c1415682121ba24c4ae37552da7ad72388cff 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.318 2006/04/23 11:10:31 robertc Exp $
+ * $Id: acl.cc,v 1.319 2006/04/25 12:00:29 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -35,8 +35,8 @@
 #include "squid.h"
 #include "ACL.h"
 #include "ACLChecklist.h"
-#include "HttpRequest.h"
 #include "ConfigParser.h"
+#include "HttpRequest.h"
 
 const char *AclMatchedName = NULL;
 
@@ -87,7 +87,7 @@ bool ACL::valid () const
 }
 
 void
-ACL::ParseAclLine(ACL ** head)
+ACL::ParseAclLine(ConfigParser &parser, ACL ** head)
 {
     /* we're already using strtok() to grok the line */
     char *t = NULL;
@@ -99,7 +99,7 @@ ACL::ParseAclLine(ACL ** head)
 
     if ((t = strtok(NULL, w_space)) == NULL) {
         debug(28, 0) ("aclParseAclLine: missing ACL name.\n");
-        ConfigParser::Destruct();
+        parser.destruct();
         return;
     }
 
@@ -109,13 +109,13 @@ ACL::ParseAclLine(ACL ** head)
 
     if ((theType = strtok(NULL, w_space)) == NULL) {
         debug(28, 0) ("aclParseAclLine: missing ACL type.\n");
-        ConfigParser::Destruct();
+        parser.destruct();
         return;
     }
 
     if (!Prototype::Registered (theType)) {
         debug(28, 0) ("aclParseAclLine: Invalid ACL type '%s'\n", theType);
-        ConfigParser::Destruct();
+        parser.destruct();
         return;
     }
 
@@ -128,7 +128,7 @@ ACL::ParseAclLine(ACL ** head)
     } else {
         if (strcmp (A->typeString(),theType) ) {
             debug(28, 0) ("aclParseAclLine: ACL '%s' already exists with different type.\n", A->name);
-            ConfigParser::Destruct();
+            parser.destruct();
             return;
         }
 

diff --git a/src/acl_noncore.cc b/src/acl_noncore.cc
index 57e4401dc337895cb409498f606dc5be4820f97f..0f492571a21cff8ddd54f758ec858af48245ce13 100644 (file)
--- a/src/acl_noncore.cc
+++ b/src/acl_noncore.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl_noncore.cc,v 1.1 2006/04/23 11:10:31 robertc Exp $
+ * $Id: acl_noncore.cc,v 1.2 2006/04/25 12:00:29 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -41,8 +41,8 @@
 #include "squid.h"
 #include "ACL.h"
 #include "ACLChecklist.h"
-#include "HttpRequest.h"
 #include "ConfigParser.h"
+#include "HttpRequest.h"
 
 
 /* does name lookup, returns page_id */
@@ -164,7 +164,7 @@ aclParseDenyInfoLine(acl_deny_info_list ** head)
 }
 
 void
-aclParseAccessLine(acl_access ** head)
+aclParseAccessLine(ConfigParser &parser, acl_access ** head)
 {
     char *t = NULL;
     acl_access *A = NULL;
@@ -194,7 +194,7 @@ aclParseAccessLine(acl_access ** head)
         return;
     }
 
-    aclParseAclList(&A->aclList);
+    aclParseAclList(parser, &A->aclList);
 
     if (A->aclList == NULL) {
         debug(28, 0) ("%s line %d: %s\n",
@@ -216,7 +216,7 @@ aclParseAccessLine(acl_access ** head)
 }
 
 void
-aclParseAclList(acl_list ** head)
+aclParseAclList(ConfigParser &parser, acl_list ** head)
 {
     acl_list **Tail = head;    /* sane name in the use below */
     ACL *a = NULL;
@@ -239,7 +239,7 @@ aclParseAclList(acl_list ** head)
         if (a == NULL) {
             debug(28, 0) ("aclParseAccessLine: ACL name '%s' not found.\n", t);
             delete L;
-            ConfigParser::Destruct();
+            parser.destruct();
             continue;
         }
 

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index e6a7ec0532bef06b6dbe554215f73fe296d69d4b..e98caf1544be353b2e8686b1727123d05f40a93c 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.490 2006/04/23 11:10:31 robertc Exp $
+ * $Id: cache_cf.cc,v 1.491 2006/04/25 12:00:29 robertc Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -145,10 +145,13 @@ static int check_null_https_port_list(const https_port_list *);
 #endif /* USE_SSL */
 static void parse_b_size_t(size_t * var);
 
+/* a parser for legacy code that uses the global approach */
+static ConfigParser LegacyParser = ConfigParser();
+
 void
 self_destruct(void)
 {
-    ConfigParser::Destruct();
+    LegacyParser.destruct();
 }
 
 /*
@@ -778,7 +781,7 @@ dump_acl(StoreEntry * entry, const char *name, ACL * ae)
 static void
 parse_acl(ACL ** ae)
 {
-    ACL::ParseAclLine(ae);
+    ACL::ParseAclLine(LegacyParser, ae);
 }
 
 static void
@@ -816,7 +819,7 @@ dump_acl_access(StoreEntry * entry, const char *name, acl_access * head)
 static void
 parse_acl_access(acl_access ** head)
 {
-    aclParseAccessLine(head);
+    aclParseAccessLine(LegacyParser, head);
 }
 
 static void
@@ -893,7 +896,7 @@ parse_acl_address(acl_address ** head)
     CBDATA_INIT_TYPE_FREECB(acl_address, freed_acl_address);
     l = cbdataAlloc(acl_address);
     parse_address(&l->addr);
-    aclParseAclList(&l->aclList);
+    aclParseAclList(LegacyParser, &l->aclList);
 
     while (*tail)
         tail = &(*tail)->next;
@@ -961,7 +964,7 @@ parse_acl_tos(acl_tos ** head)
 
     l->tos = tos;
 
-    aclParseAclList(&l->aclList);
+    aclParseAclList(LegacyParser, &l->aclList);
 
     while (*tail)
         tail = &(*tail)->next;
@@ -1018,7 +1021,7 @@ parse_acl_b_size_t(acl_size_t ** head)
 
     parse_b_size_t(&l->size);
 
-    aclParseAclList(&l->aclList);
+    aclParseAclList(LegacyParser, &l->aclList);
 
     while (*tail)
         tail = &(*tail)->next;
@@ -1084,7 +1087,7 @@ parse_delay_pool_rates(DelayConfig * cfg)
 static void
 parse_delay_pool_access(DelayConfig * cfg)
 {
-    cfg->parsePoolAccess();
+    cfg->parsePoolAccess(LegacyParser);
 }
 
 #endif
@@ -1800,7 +1803,7 @@ parse_peer_access(void)
         return;
     }
 
-    aclParseAccessLine(&p->access);
+    aclParseAccessLine(LegacyParser, &p->access);
 }
 
 static void
@@ -3117,7 +3120,7 @@ parse_access_log(customlog ** logs)
     }
 
 done:
-    aclParseAclList(&cl->aclList);
+    aclParseAclList(LegacyParser, &cl->aclList);
 
     while (*logs)
         logs = &(*logs)->next;