]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bootstrapped
authorhno <>
Wed, 13 Feb 2008 08:10:45 +0000 (08:10 +0000)
committerhno <>
Wed, 13 Feb 2008 08:10:45 +0000 (08:10 +0000)
src/Makefile.in

index 20d7d6af5e7025d3d37ca20623ed5bfc6679330b..7dcb5da3bddba44c3e2dd5af54354a766cbf628c 100644 (file)
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.457 2008/02/12 01:10:48 hno Exp $
+#  $Id: Makefile.in,v 1.458 2008/02/13 01:10:45 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -81,13 +81,12 @@ ARFLAGS = cru
 ICAP_libicap_a_AR = $(AR) $(ARFLAGS)
 ICAP_libicap_a_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
-am_ICAP_libicap_a_OBJECTS = ICAP/AsyncJob.$(OBJEXT) \
-       ICAP/ICAPClient.$(OBJEXT) ICAP/ICAPInitiator.$(OBJEXT) \
-       ICAP/ICAPInitiate.$(OBJEXT) ICAP/ICAPLauncher.$(OBJEXT) \
-       ICAP/ICAPConfig.$(OBJEXT) ICAP/ICAPElements.$(OBJEXT) \
-       ICAP/ICAPModXact.$(OBJEXT) ICAP/ICAPOptions.$(OBJEXT) \
-       ICAP/ICAPOptXact.$(OBJEXT) ICAP/ICAPServiceRep.$(OBJEXT) \
-       ICAP/ICAPXaction.$(OBJEXT)
+am_ICAP_libicap_a_OBJECTS = ICAP/ICAPClient.$(OBJEXT) \
+       ICAP/ICAPInitiator.$(OBJEXT) ICAP/ICAPInitiate.$(OBJEXT) \
+       ICAP/ICAPLauncher.$(OBJEXT) ICAP/ICAPConfig.$(OBJEXT) \
+       ICAP/ICAPElements.$(OBJEXT) ICAP/ICAPModXact.$(OBJEXT) \
+       ICAP/ICAPOptions.$(OBJEXT) ICAP/ICAPOptXact.$(OBJEXT) \
+       ICAP/ICAPServiceRep.$(OBJEXT) ICAP/ICAPXaction.$(OBJEXT)
 ICAP_libicap_a_OBJECTS = $(am_ICAP_libicap_a_OBJECTS)
 libAIO_a_AR = $(AR) $(ARFLAGS)
 libAIO_a_LIBADD =
@@ -137,7 +136,8 @@ am_libauth_la_OBJECTS = AuthConfig.lo AuthScheme.lo AuthUser.lo \
        AuthUserRequest.lo
 libauth_la_OBJECTS = $(am_libauth_la_OBJECTS)
 libsquid_la_LIBADD =
-am_libsquid_la_OBJECTS = comm.lo IPInterception.lo
+am_libsquid_la_OBJECTS = comm.lo CommCalls.lo IPInterception.lo \
+       ICAP/AsyncJob.lo TextException.lo
 libsquid_la_OBJECTS = $(am_libsquid_la_OBJECTS)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
        "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(datadir)" \
@@ -200,10 +200,11 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \
        ACLStringData.h ACLTime.cc ACLTime.h ACLTimeData.cc \
        ACLTimeData.h ACLUrl.cc ACLUrl.h ACLUrlPath.cc ACLUrlPath.h \
        ACLUrlPort.cc ACLUrlPort.h ACLUserData.cc ACLUserData.h asn.cc \
-       AsyncCall.cc AsyncCall.h AsyncEngine.cc AsyncEngine.h \
-       authenticate.cc authenticate.h cache_cf.cc ProtoPort.cc \
-       ProtoPort.h CacheDigest.cc cache_manager.cc CacheManager.h \
-       carp.cc cbdata.cc cbdata.h ChunkedCodingParser.cc \
+       AsyncCallQueue.cc AsyncCallQueue.h AsyncCall.cc AsyncCall.h \
+       AsyncJobCalls.h AsyncEngine.cc AsyncEngine.h authenticate.cc \
+       authenticate.h cache_cf.cc ProtoPort.cc ProtoPort.h \
+       CacheDigest.cc cache_manager.cc CacheManager.h carp.cc \
+       cbdata.cc cbdata.h ChunkedCodingParser.cc \
        ChunkedCodingParser.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 BodyPipe.cc \
@@ -269,11 +270,10 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \
        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 TextException.cc \
-       TextException.h time.cc tools.cc tunnel.cc typedefs.h \
-       unlinkd.cc url.cc URL.h URLScheme.cc URLScheme.h urn.cc \
-       useragent.cc wccp.cc wccp2.cc whois.cc wordlist.cc wordlist.h \
-       win32.cc WinSvc.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 wccp.cc wccp2.cc whois.cc wordlist.cc \
+       wordlist.h win32.cc WinSvc.cc
 am__objects_4 = ACLARP.$(OBJEXT)
 @ENABLE_ARP_ACL_TRUE@am__objects_5 = $(am__objects_4)
 am__objects_6 = $(am__objects_5) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \
@@ -331,24 +331,24 @@ am__objects_23 = ACLCertificateData.$(OBJEXT) ACLCertificate.$(OBJEXT) \
 @ENABLE_WIN32SPECIFIC_TRUE@am__objects_27 = WinSvc.$(OBJEXT)
 am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \
        acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) $(am__objects_6) \
-       asn.$(OBJEXT) AsyncCall.$(OBJEXT) AsyncEngine.$(OBJEXT) \
-       authenticate.$(OBJEXT) cache_cf.$(OBJEXT) ProtoPort.$(OBJEXT) \
-       CacheDigest.$(OBJEXT) cache_manager.$(OBJEXT) carp.$(OBJEXT) \
-       cbdata.$(OBJEXT) ChunkedCodingParser.$(OBJEXT) \
-       client_db.$(OBJEXT) client_side.$(OBJEXT) \
-       client_side_reply.$(OBJEXT) client_side_request.$(OBJEXT) \
-       BodyPipe.$(OBJEXT) clientStream.$(OBJEXT) \
-       CompletionDispatcher.$(OBJEXT) $(am__objects_7) \
-       ConfigOption.$(OBJEXT) ConfigParser.$(OBJEXT) debug.$(OBJEXT) \
-       $(am__objects_9) disk.$(OBJEXT) $(am__objects_10) \
-       $(am__objects_11) errorpage.$(OBJEXT) $(am__objects_13) \
-       ETag.$(OBJEXT) event.$(OBJEXT) EventLoop.$(OBJEXT) \
-       external_acl.$(OBJEXT) ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) \
-       fde.$(OBJEXT) filemap.$(OBJEXT) forward.$(OBJEXT) \
-       fqdncache.$(OBJEXT) ftp.$(OBJEXT) gopher.$(OBJEXT) \
-       helper.$(OBJEXT) $(am__objects_14) http.$(OBJEXT) \
-       HttpStatusLine.$(OBJEXT) HttpHdrCc.$(OBJEXT) \
-       HttpHdrRange.$(OBJEXT) HttpHdrSc.$(OBJEXT) \
+       asn.$(OBJEXT) AsyncCallQueue.$(OBJEXT) AsyncCall.$(OBJEXT) \
+       AsyncEngine.$(OBJEXT) authenticate.$(OBJEXT) \
+       cache_cf.$(OBJEXT) ProtoPort.$(OBJEXT) CacheDigest.$(OBJEXT) \
+       cache_manager.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
+       ChunkedCodingParser.$(OBJEXT) client_db.$(OBJEXT) \
+       client_side.$(OBJEXT) client_side_reply.$(OBJEXT) \
+       client_side_request.$(OBJEXT) BodyPipe.$(OBJEXT) \
+       clientStream.$(OBJEXT) CompletionDispatcher.$(OBJEXT) \
+       $(am__objects_7) ConfigOption.$(OBJEXT) ConfigParser.$(OBJEXT) \
+       debug.$(OBJEXT) $(am__objects_9) disk.$(OBJEXT) \
+       $(am__objects_10) $(am__objects_11) errorpage.$(OBJEXT) \
+       $(am__objects_13) ETag.$(OBJEXT) event.$(OBJEXT) \
+       EventLoop.$(OBJEXT) external_acl.$(OBJEXT) \
+       ExternalACLEntry.$(OBJEXT) fd.$(OBJEXT) fde.$(OBJEXT) \
+       filemap.$(OBJEXT) forward.$(OBJEXT) fqdncache.$(OBJEXT) \
+       ftp.$(OBJEXT) gopher.$(OBJEXT) helper.$(OBJEXT) \
+       $(am__objects_14) http.$(OBJEXT) HttpStatusLine.$(OBJEXT) \
+       HttpHdrCc.$(OBJEXT) HttpHdrRange.$(OBJEXT) HttpHdrSc.$(OBJEXT) \
        HttpHdrScTarget.$(OBJEXT) HttpHdrContRange.$(OBJEXT) \
        HttpHeader.$(OBJEXT) HttpHeaderTools.$(OBJEXT) \
        HttpBody.$(OBJEXT) HttpMsg.$(OBJEXT) HttpReply.$(OBJEXT) \
@@ -376,12 +376,12 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \
        StoreMetaSTD.$(OBJEXT) StoreMetaSTDLFS.$(OBJEXT) \
        StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
        StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
-       Server.$(OBJEXT) SwapDir.$(OBJEXT) TextException.$(OBJEXT) \
-       time.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
-       $(am__objects_25) url.$(OBJEXT) URLScheme.$(OBJEXT) \
-       urn.$(OBJEXT) useragent.$(OBJEXT) wccp.$(OBJEXT) \
-       wccp2.$(OBJEXT) whois.$(OBJEXT) wordlist.$(OBJEXT) \
-       $(am__objects_26) $(am__objects_27)
+       Server.$(OBJEXT) SwapDir.$(OBJEXT) time.$(OBJEXT) \
+       tools.$(OBJEXT) tunnel.$(OBJEXT) $(am__objects_25) \
+       url.$(OBJEXT) URLScheme.$(OBJEXT) urn.$(OBJEXT) \
+       useragent.$(OBJEXT) wccp.$(OBJEXT) wccp2.$(OBJEXT) \
+       whois.$(OBJEXT) wordlist.$(OBJEXT) $(am__objects_26) \
+       $(am__objects_27)
 am__EXTRA_squid_SOURCES_DIST = fs/aufs/StoreFSaufs.cc \
        fs/coss/StoreFScoss.cc fs/diskd/StoreFSdiskd.cc \
        fs/ufs/StoreFSufs.cc DiskIO/AIO/AIODiskIOModule.cc \
@@ -467,14 +467,15 @@ am__tests_testCacheManager_SOURCES_DIST = debug.cc globals.cc \
        tests/testCacheManager.cc tests/testCacheManager.h \
        tests/testMain.cc time.cc access_log.cc acl.cc acl_noncore.cc \
        ACLChecklist.cc ACLProxyAuth.cc ACLStringData.cc \
-       ACLRegexData.cc ACLUserData.cc AsyncCall.cc authenticate.cc \
-       BodyPipe.cc cache_manager.cc cache_cf.cc ProtoPort.cc \
-       ProtoPort.h CacheDigest.cc carp.cc cbdata.cc \
-       ChunkedCodingParser.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 \
+       ACLRegexData.cc ACLUserData.cc AsyncCallQueue.cc \
+       AsyncCallQueue.h AsyncCall.cc authenticate.cc BodyPipe.cc \
+       cache_manager.cc cache_cf.cc ProtoPort.cc ProtoPort.h \
+       CacheDigest.cc carp.cc cbdata.cc ChunkedCodingParser.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 \
@@ -510,9 +511,9 @@ am__tests_testCacheManager_SOURCES_DIST = debug.cc globals.cc \
        store_swapmeta.cc store_swapout.cc StoreFileSystem.cc \
        StoreIOState.cc StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
        StoreMetaSTDLFS.cc StoreMetaUnpacker.cc StoreMetaURL.cc \
-       StoreMetaVary.cc StoreSwapLogData.cc TextException.cc tools.cc \
-       tunnel.cc SwapDir.cc url.cc URLScheme.cc urn.cc useragent.cc \
-       wccp2.cc whois.cc win32.cc wordlist.cc
+       StoreMetaVary.cc StoreSwapLogData.cc tools.cc tunnel.cc \
+       SwapDir.cc url.cc URLScheme.cc urn.cc useragent.cc wccp2.cc \
+       whois.cc win32.cc wordlist.cc
 am_tests_testCacheManager_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \
        HttpRequest.$(OBJEXT) HttpRequestMethod.$(OBJEXT) \
        mem.$(OBJEXT) String.$(OBJEXT) \
@@ -521,7 +522,8 @@ am_tests_testCacheManager_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \
        acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) \
        ACLProxyAuth.$(OBJEXT) ACLStringData.$(OBJEXT) \
        ACLRegexData.$(OBJEXT) ACLUserData.$(OBJEXT) \
-       AsyncCall.$(OBJEXT) authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
+       AsyncCallQueue.$(OBJEXT) AsyncCall.$(OBJEXT) \
+       authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
        cache_manager.$(OBJEXT) cache_cf.$(OBJEXT) ProtoPort.$(OBJEXT) \
        CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
        ChunkedCodingParser.$(OBJEXT) client_db.$(OBJEXT) \
@@ -559,11 +561,10 @@ am_tests_testCacheManager_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \
        StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
        StoreMetaSTDLFS.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \
        StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \
-       StoreSwapLogData.$(OBJEXT) TextException.$(OBJEXT) \
-       tools.$(OBJEXT) tunnel.$(OBJEXT) SwapDir.$(OBJEXT) \
-       url.$(OBJEXT) URLScheme.$(OBJEXT) urn.$(OBJEXT) \
-       useragent.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \
-       $(am__objects_26) wordlist.$(OBJEXT)
+       StoreSwapLogData.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
+       SwapDir.$(OBJEXT) url.$(OBJEXT) URLScheme.$(OBJEXT) \
+       urn.$(OBJEXT) useragent.$(OBJEXT) wccp2.$(OBJEXT) \
+       whois.$(OBJEXT) $(am__objects_26) wordlist.$(OBJEXT)
 nodist_tests_testCacheManager_OBJECTS = repl_modules.$(OBJEXT) \
        string_arrays.$(OBJEXT)
 tests_testCacheManager_OBJECTS = $(am_tests_testCacheManager_OBJECTS) \
@@ -694,14 +695,14 @@ am__tests_testEvent_SOURCES_DIST = debug.cc EventLoop.h EventLoop.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 AsyncCall.cc authenticate.cc BodyPipe.cc \
-       cache_manager.cc cache_cf.cc ProtoPort.cc ProtoPort.h \
-       CacheDigest.cc carp.cc cbdata.cc ChunkedCodingParser.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 \
+       ACLUserData.cc AsyncCallQueue.cc AsyncCallQueue.h AsyncCall.cc \
+       authenticate.cc BodyPipe.cc cache_manager.cc cache_cf.cc \
+       ProtoPort.cc ProtoPort.h CacheDigest.cc carp.cc cbdata.cc \
+       ChunkedCodingParser.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 \
@@ -737,9 +738,9 @@ am__tests_testEvent_SOURCES_DIST = debug.cc EventLoop.h EventLoop.cc \
        store_swapout.cc StoreFileSystem.cc StoreIOState.cc \
        StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
        StoreMetaSTDLFS.cc StoreMetaUnpacker.cc StoreMetaURL.cc \
-       StoreMetaVary.cc StoreSwapLogData.cc TextException.cc tools.cc \
-       tunnel.cc SwapDir.cc url.cc URLScheme.cc urn.cc useragent.cc \
-       wccp2.cc whois.cc win32.cc wordlist.cc
+       StoreMetaVary.cc StoreSwapLogData.cc tools.cc tunnel.cc \
+       SwapDir.cc url.cc URLScheme.cc urn.cc useragent.cc wccp2.cc \
+       whois.cc win32.cc wordlist.cc
 am_tests_testEvent_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \
        globals.$(OBJEXT) HttpRequest.$(OBJEXT) \
        HttpRequestMethod.$(OBJEXT) mem.$(OBJEXT) \
@@ -749,7 +750,8 @@ am_tests_testEvent_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \
        acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) \
        ACLProxyAuth.$(OBJEXT) ACLStringData.$(OBJEXT) \
        ACLRegexData.$(OBJEXT) ACLUserData.$(OBJEXT) \
-       AsyncCall.$(OBJEXT) authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
+       AsyncCallQueue.$(OBJEXT) AsyncCall.$(OBJEXT) \
+       authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
        cache_manager.$(OBJEXT) cache_cf.$(OBJEXT) ProtoPort.$(OBJEXT) \
        CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
        ChunkedCodingParser.$(OBJEXT) client_db.$(OBJEXT) \
@@ -787,10 +789,10 @@ am_tests_testEvent_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \
        StoreMetaSTD.$(OBJEXT) StoreMetaSTDLFS.$(OBJEXT) \
        StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
        StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
-       TextException.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
-       SwapDir.$(OBJEXT) url.$(OBJEXT) URLScheme.$(OBJEXT) \
-       urn.$(OBJEXT) useragent.$(OBJEXT) wccp2.$(OBJEXT) \
-       whois.$(OBJEXT) $(am__objects_26) wordlist.$(OBJEXT)
+       tools.$(OBJEXT) tunnel.$(OBJEXT) SwapDir.$(OBJEXT) \
+       url.$(OBJEXT) URLScheme.$(OBJEXT) urn.$(OBJEXT) \
+       useragent.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \
+       $(am__objects_26) wordlist.$(OBJEXT)
 nodist_tests_testEvent_OBJECTS = repl_modules.$(OBJEXT) \
        string_arrays.$(OBJEXT)
 tests_testEvent_OBJECTS = $(am_tests_testEvent_OBJECTS) \
@@ -800,7 +802,8 @@ am__tests_testEventLoop_SOURCES_DIST = debug.cc EventLoop.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 AsyncCall.cc \
+       ACLStringData.cc ACLRegexData.cc ACLUserData.cc \
+       AsyncCallQueue.cc AsyncCallQueue.h AsyncCall.cc \
        authenticate.cc BodyPipe.cc cache_manager.cc cache_cf.cc \
        ProtoPort.cc ProtoPort.h CacheDigest.cc carp.cc cbdata.cc \
        ChunkedCodingParser.cc client_db.cc client_side.cc \
@@ -843,9 +846,9 @@ am__tests_testEventLoop_SOURCES_DIST = debug.cc EventLoop.h \
        store_swapout.cc StoreFileSystem.cc StoreIOState.cc \
        StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
        StoreMetaSTDLFS.cc StoreMetaUnpacker.cc StoreMetaURL.cc \
-       StoreMetaVary.cc StoreSwapLogData.cc TextException.cc tools.cc \
-       tunnel.cc SwapDir.cc url.cc URLScheme.cc urn.cc useragent.cc \
-       wccp2.cc whois.cc win32.cc wordlist.cc
+       StoreMetaVary.cc StoreSwapLogData.cc tools.cc tunnel.cc \
+       SwapDir.cc url.cc URLScheme.cc urn.cc useragent.cc wccp2.cc \
+       whois.cc win32.cc wordlist.cc
 am_tests_testEventLoop_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \
        globals.$(OBJEXT) HttpRequest.$(OBJEXT) \
        HttpRequestMethod.$(OBJEXT) mem.$(OBJEXT) \
@@ -855,7 +858,8 @@ am_tests_testEventLoop_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \
        acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) \
        ACLProxyAuth.$(OBJEXT) ACLStringData.$(OBJEXT) \
        ACLRegexData.$(OBJEXT) ACLUserData.$(OBJEXT) \
-       AsyncCall.$(OBJEXT) authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
+       AsyncCallQueue.$(OBJEXT) AsyncCall.$(OBJEXT) \
+       authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
        cache_manager.$(OBJEXT) cache_cf.$(OBJEXT) ProtoPort.$(OBJEXT) \
        CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
        ChunkedCodingParser.$(OBJEXT) client_db.$(OBJEXT) \
@@ -893,10 +897,10 @@ am_tests_testEventLoop_OBJECTS = debug.$(OBJEXT) EventLoop.$(OBJEXT) \
        StoreMetaSTD.$(OBJEXT) StoreMetaSTDLFS.$(OBJEXT) \
        StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
        StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
-       TextException.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
-       SwapDir.$(OBJEXT) url.$(OBJEXT) URLScheme.$(OBJEXT) \
-       urn.$(OBJEXT) useragent.$(OBJEXT) wccp2.$(OBJEXT) \
-       whois.$(OBJEXT) $(am__objects_26) wordlist.$(OBJEXT)
+       tools.$(OBJEXT) tunnel.$(OBJEXT) SwapDir.$(OBJEXT) \
+       url.$(OBJEXT) URLScheme.$(OBJEXT) urn.$(OBJEXT) \
+       useragent.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \
+       $(am__objects_26) wordlist.$(OBJEXT)
 nodist_tests_testEventLoop_OBJECTS = repl_modules.$(OBJEXT) \
        string_arrays.$(OBJEXT)
 tests_testEventLoop_OBJECTS = $(am_tests_testEventLoop_OBJECTS) \
@@ -932,14 +936,15 @@ am__tests_testHttpRequest_SOURCES_DIST = debug.cc globals.cc \
        tests/testHttpRequestMethod.h tests/testHttpRequestMethod.cc \
        tests/testMain.cc time.cc access_log.cc acl.cc acl_noncore.cc \
        ACLChecklist.cc ACLProxyAuth.cc ACLStringData.cc \
-       ACLRegexData.cc ACLUserData.cc AsyncCall.cc authenticate.cc \
-       BodyPipe.cc cache_manager.cc cache_cf.cc ProtoPort.cc \
-       ProtoPort.h CacheDigest.cc carp.cc cbdata.cc \
-       ChunkedCodingParser.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 \
+       ACLRegexData.cc ACLUserData.cc AsyncCallQueue.cc \
+       AsyncCallQueue.h AsyncCall.cc authenticate.cc BodyPipe.cc \
+       cache_manager.cc cache_cf.cc ProtoPort.cc ProtoPort.h \
+       CacheDigest.cc carp.cc cbdata.cc ChunkedCodingParser.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 \
@@ -975,9 +980,9 @@ am__tests_testHttpRequest_SOURCES_DIST = debug.cc globals.cc \
        store_swapmeta.cc store_swapout.cc StoreFileSystem.cc \
        StoreIOState.cc StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
        StoreMetaSTDLFS.cc StoreMetaUnpacker.cc StoreMetaURL.cc \
-       StoreMetaVary.cc StoreSwapLogData.cc TextException.cc tools.cc \
-       tunnel.cc SwapDir.cc url.cc URLScheme.cc urn.cc useragent.cc \
-       wccp2.cc whois.cc win32.cc wordlist.cc
+       StoreMetaVary.cc StoreSwapLogData.cc tools.cc tunnel.cc \
+       SwapDir.cc url.cc URLScheme.cc urn.cc useragent.cc wccp2.cc \
+       whois.cc win32.cc wordlist.cc
 am_tests_testHttpRequest_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \
        HttpRequest.$(OBJEXT) HttpRequestMethod.$(OBJEXT) \
        mem.$(OBJEXT) String.$(OBJEXT) tests/testHttpRequest.$(OBJEXT) \
@@ -986,7 +991,8 @@ am_tests_testHttpRequest_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \
        acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) \
        ACLProxyAuth.$(OBJEXT) ACLStringData.$(OBJEXT) \
        ACLRegexData.$(OBJEXT) ACLUserData.$(OBJEXT) \
-       AsyncCall.$(OBJEXT) authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
+       AsyncCallQueue.$(OBJEXT) AsyncCall.$(OBJEXT) \
+       authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
        cache_manager.$(OBJEXT) cache_cf.$(OBJEXT) ProtoPort.$(OBJEXT) \
        CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
        ChunkedCodingParser.$(OBJEXT) client_db.$(OBJEXT) \
@@ -1024,11 +1030,10 @@ am_tests_testHttpRequest_OBJECTS = debug.$(OBJEXT) globals.$(OBJEXT) \
        StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
        StoreMetaSTDLFS.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \
        StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \
-       StoreSwapLogData.$(OBJEXT) TextException.$(OBJEXT) \
-       tools.$(OBJEXT) tunnel.$(OBJEXT) SwapDir.$(OBJEXT) \
-       url.$(OBJEXT) URLScheme.$(OBJEXT) urn.$(OBJEXT) \
-       useragent.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \
-       $(am__objects_26) wordlist.$(OBJEXT)
+       StoreSwapLogData.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
+       SwapDir.$(OBJEXT) url.$(OBJEXT) URLScheme.$(OBJEXT) \
+       urn.$(OBJEXT) useragent.$(OBJEXT) wccp2.$(OBJEXT) \
+       whois.$(OBJEXT) $(am__objects_26) wordlist.$(OBJEXT)
 nodist_tests_testHttpRequest_OBJECTS = repl_modules.$(OBJEXT) \
        string_arrays.$(OBJEXT)
 tests_testHttpRequest_OBJECTS = $(am_tests_testHttpRequest_OBJECTS) \
@@ -1123,14 +1128,14 @@ am__tests_testURL_SOURCES_DIST = debug.cc url.cc URLScheme.cc \
        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 \
-       ACLUserData.cc AsyncCall.cc authenticate.cc BodyPipe.cc \
-       cache_manager.cc cache_cf.cc ProtoPort.cc ProtoPort.h \
-       CacheDigest.cc carp.cc cbdata.cc ChunkedCodingParser.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 \
+       ACLUserData.cc AsyncCallQueue.cc AsyncCallQueue.h AsyncCall.cc \
+       authenticate.cc BodyPipe.cc cache_manager.cc cache_cf.cc \
+       ProtoPort.cc ProtoPort.h CacheDigest.cc carp.cc cbdata.cc \
+       ChunkedCodingParser.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 \
@@ -1166,9 +1171,9 @@ am__tests_testURL_SOURCES_DIST = debug.cc url.cc URLScheme.cc \
        store_swapout.cc StoreFileSystem.cc StoreIOState.cc \
        StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
        StoreMetaSTDLFS.cc StoreMetaUnpacker.cc StoreMetaURL.cc \
-       StoreMetaVary.cc StoreSwapLogData.cc TextException.cc tools.cc \
-       tunnel.cc SwapDir.cc urn.cc useragent.cc wccp2.cc whois.cc \
-       win32.cc wordlist.cc
+       StoreMetaVary.cc StoreSwapLogData.cc tools.cc tunnel.cc \
+       SwapDir.cc urn.cc useragent.cc wccp2.cc whois.cc win32.cc \
+       wordlist.cc
 am_tests_testURL_OBJECTS = debug.$(OBJEXT) url.$(OBJEXT) \
        URLScheme.$(OBJEXT) globals.$(OBJEXT) HttpRequest.$(OBJEXT) \
        HttpRequestMethod.$(OBJEXT) mem.$(OBJEXT) \
@@ -1178,7 +1183,8 @@ am_tests_testURL_OBJECTS = debug.$(OBJEXT) url.$(OBJEXT) \
        acl.$(OBJEXT) acl_noncore.$(OBJEXT) ACLChecklist.$(OBJEXT) \
        ACLProxyAuth.$(OBJEXT) ACLStringData.$(OBJEXT) \
        ACLRegexData.$(OBJEXT) ACLUserData.$(OBJEXT) \
-       AsyncCall.$(OBJEXT) authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
+       AsyncCallQueue.$(OBJEXT) AsyncCall.$(OBJEXT) \
+       authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
        cache_manager.$(OBJEXT) cache_cf.$(OBJEXT) ProtoPort.$(OBJEXT) \
        CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
        ChunkedCodingParser.$(OBJEXT) client_db.$(OBJEXT) \
@@ -1216,10 +1222,9 @@ am_tests_testURL_OBJECTS = debug.$(OBJEXT) url.$(OBJEXT) \
        StoreMetaSTD.$(OBJEXT) StoreMetaSTDLFS.$(OBJEXT) \
        StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
        StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
-       TextException.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
-       SwapDir.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) \
-       wccp2.$(OBJEXT) whois.$(OBJEXT) $(am__objects_26) \
-       wordlist.$(OBJEXT)
+       tools.$(OBJEXT) tunnel.$(OBJEXT) SwapDir.$(OBJEXT) \
+       urn.$(OBJEXT) useragent.$(OBJEXT) wccp2.$(OBJEXT) \
+       whois.$(OBJEXT) $(am__objects_26) wordlist.$(OBJEXT)
 nodist_tests_testURL_OBJECTS = repl_modules.$(OBJEXT) \
        string_arrays.$(OBJEXT)
 tests_testURL_OBJECTS = $(am_tests_testURL_OBJECTS) \
@@ -1266,32 +1271,33 @@ tests_testUfs_OBJECTS = $(am_tests_testUfs_OBJECTS)
 am__tests_test_http_range_SOURCES_DIST = tests/test_http_range.cc \
        access_log.cc acl.cc acl_noncore.cc ACLChecklist.cc \
        ACLProxyAuth.cc ACLStringData.cc ACLRegexData.cc \
-       ACLUserData.cc AsyncCall.cc authenticate.cc BodyPipe.cc \
-       cache_cf.cc ProtoPort.cc ProtoPort.h cache_manager.cc \
-       CacheDigest.cc carp.cc cbdata.cc ChunkedCodingParser.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 debug.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 disk.cc dns_internal.cc dns.cc \
-       event.cc 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 \
-       external_acl.cc ExternalACLEntry.cc fd.cc fde.cc forward.cc \
-       fqdncache.cc ftp.cc globals.cc gopher.cc helper.cc htcp.cc \
-       htcp.h http.cc HttpBody.cc HttpHdrCc.cc HttpHdrContRange.cc \
-       HttpHdrRange.cc HttpHdrSc.cc HttpHdrScTarget.cc HttpHeader.cc \
+       ACLUserData.cc AsyncCallQueue.cc AsyncCallQueue.h AsyncCall.cc \
+       authenticate.cc BodyPipe.cc cache_cf.cc ProtoPort.cc \
+       ProtoPort.h cache_manager.cc CacheDigest.cc carp.cc cbdata.cc \
+       ChunkedCodingParser.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 debug.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 disk.cc \
+       dns_internal.cc dns.cc event.cc 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 external_acl.cc \
+       ExternalACLEntry.cc fd.cc fde.cc forward.cc fqdncache.cc \
+       ftp.cc globals.cc gopher.cc helper.cc htcp.cc htcp.h http.cc \
+       HttpBody.cc HttpHdrCc.cc HttpHdrContRange.cc HttpHdrRange.cc \
+       HttpHdrSc.cc HttpHdrScTarget.cc HttpHeader.cc \
        HttpHeaderTools.cc HttpMsg.cc HttpReply.cc HttpRequest.cc \
        HttpRequestMethod.cc HttpStatusLine.cc ICMP.h icmp.cc \
        ICMPConfig.h ICMPSquid.h ICMPSquid.cc icp_v2.cc icp_v3.cc \
@@ -1310,17 +1316,16 @@ am__tests_test_http_range_SOURCES_DIST = tests/test_http_range.cc \
        StoreFileSystem.cc StoreIOState.cc StoreMeta.cc \
        StoreMetaMD5.cc StoreMetaSTD.cc StoreMetaSTDLFS.cc \
        StoreMetaUnpacker.cc StoreMetaURL.cc StoreMetaVary.cc \
-       StoreSwapLogData.cc String.cc SwapDir.cc TextException.cc \
-       time.cc tools.cc tunnel.cc url.cc URLScheme.cc urn.cc \
-       useragent.cc wccp2.cc whois.cc win32.cc wordlist.cc Packer.cc \
-       MemBuf.cc
+       StoreSwapLogData.cc String.cc SwapDir.cc time.cc tools.cc \
+       tunnel.cc url.cc URLScheme.cc urn.cc useragent.cc wccp2.cc \
+       whois.cc win32.cc wordlist.cc Packer.cc MemBuf.cc
 am_tests_test_http_range_OBJECTS = tests/test_http_range.$(OBJEXT) \
        access_log.$(OBJEXT) acl.$(OBJEXT) acl_noncore.$(OBJEXT) \
        ACLChecklist.$(OBJEXT) ACLProxyAuth.$(OBJEXT) \
        ACLStringData.$(OBJEXT) ACLRegexData.$(OBJEXT) \
-       ACLUserData.$(OBJEXT) AsyncCall.$(OBJEXT) \
-       authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) cache_cf.$(OBJEXT) \
-       ProtoPort.$(OBJEXT) cache_manager.$(OBJEXT) \
+       ACLUserData.$(OBJEXT) AsyncCallQueue.$(OBJEXT) \
+       AsyncCall.$(OBJEXT) authenticate.$(OBJEXT) BodyPipe.$(OBJEXT) \
+       cache_cf.$(OBJEXT) ProtoPort.$(OBJEXT) cache_manager.$(OBJEXT) \
        CacheDigest.$(OBJEXT) carp.$(OBJEXT) cbdata.$(OBJEXT) \
        ChunkedCodingParser.$(OBJEXT) client_db.$(OBJEXT) \
        client_side.$(OBJEXT) client_side_reply.$(OBJEXT) \
@@ -1359,8 +1364,8 @@ am_tests_test_http_range_OBJECTS = tests/test_http_range.$(OBJEXT) \
        StoreMetaSTD.$(OBJEXT) StoreMetaSTDLFS.$(OBJEXT) \
        StoreMetaUnpacker.$(OBJEXT) StoreMetaURL.$(OBJEXT) \
        StoreMetaVary.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
-       String.$(OBJEXT) SwapDir.$(OBJEXT) TextException.$(OBJEXT) \
-       time.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) url.$(OBJEXT) \
+       String.$(OBJEXT) SwapDir.$(OBJEXT) time.$(OBJEXT) \
+       tools.$(OBJEXT) tunnel.$(OBJEXT) url.$(OBJEXT) \
        URLScheme.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) \
        wccp2.$(OBJEXT) whois.$(OBJEXT) $(am__objects_26) \
        wordlist.$(OBJEXT) Packer.$(OBJEXT) MemBuf.$(OBJEXT)
@@ -1372,66 +1377,66 @@ am__ufsdump_SOURCES_DIST = debug.cc int.cc mem.cc store_key_md5.cc \
        StoreMeta.cc StoreMetaMD5.cc StoreMetaSTD.cc \
        StoreMetaSTDLFS.cc StoreMetaUnpacker.cc StoreMetaURL.cc \
        StoreMetaVary.cc String.cc time.cc ufsdump.cc url.cc \
-       AsyncCall.cc AsyncCall.h BodyPipe.cc BodyPipe.h \
-       ConfigParser.cc store.cc StoreFileSystem.cc \
-       StoreSwapLogData.cc StoreSwapLogData.h access_log.cc acl.cc \
-       acl_noncore.cc ACLChecklist.cc ACLProxyAuth.cc ACLUserData.cc \
-       ACLRegexData.cc ACLStringData.cc authenticate.cc cache_cf.cc \
-       ProtoPort.cc ProtoPort.h cache_manager.cc CacheDigest.cc \
-       carp.cc cbdata.cc ChunkedCodingParser.cc ChunkedCodingParser.h \
-       client_db.cc client_side.cc client_side_reply.cc \
-       client_side_request.cc client_side_request.h clientStream.cc \
-       clientStream.h CommIO.h 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 \
-       defines.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 \
-       disk.cc dns_internal.cc dns.cc 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.h icmp.cc ICMPConfig.h ICMPSquid.h \
-       ICMPSquid.cc icp_v2.cc icp_v3.cc ACLIdent.cc ACLIdent.h \
-       ident.cc internal.cc ipc.cc ipc_win32.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 \
-       ACLSslError.cc ACLSslError.h ACLSslErrorData.cc \
-       ACLSslErrorData.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 TextException.cc TextException.h tools.cc \
-       typedefs.h unlinkd.cc URLScheme.cc urn.cc useragent.cc wccp.cc \
-       wccp2.cc whois.cc wordlist.cc win32.cc
+       AsyncCallQueue.cc AsyncCallQueue.h AsyncCall.cc AsyncCall.h \
+       BodyPipe.cc BodyPipe.h ConfigParser.cc store.cc \
+       StoreFileSystem.cc StoreSwapLogData.cc StoreSwapLogData.h \
+       access_log.cc acl.cc acl_noncore.cc ACLChecklist.cc \
+       ACLProxyAuth.cc ACLUserData.cc ACLRegexData.cc \
+       ACLStringData.cc authenticate.cc cache_cf.cc ProtoPort.cc \
+       ProtoPort.h cache_manager.cc CacheDigest.cc carp.cc cbdata.cc \
+       ChunkedCodingParser.cc ChunkedCodingParser.h client_db.cc \
+       client_side.cc client_side_reply.cc client_side_request.cc \
+       client_side_request.h clientStream.cc clientStream.h CommIO.h \
+       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 defines.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 disk.cc dns_internal.cc dns.cc \
+       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.h \
+       icmp.cc ICMPConfig.h ICMPSquid.h ICMPSquid.cc icp_v2.cc \
+       icp_v3.cc ACLIdent.cc ACLIdent.h ident.cc internal.cc ipc.cc \
+       ipc_win32.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 ACLSslError.cc \
+       ACLSslError.h ACLSslErrorData.cc ACLSslErrorData.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 \
+       tools.cc typedefs.h unlinkd.cc URLScheme.cc urn.cc \
+       useragent.cc wccp.cc wccp2.cc whois.cc wordlist.cc win32.cc
 am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) mem.$(OBJEXT) \
        store_key_md5.$(OBJEXT) StoreMeta.$(OBJEXT) \
        StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \
        StoreMetaSTDLFS.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \
        StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \
        String.$(OBJEXT) time.$(OBJEXT) ufsdump.$(OBJEXT) \
-       url.$(OBJEXT) AsyncCall.$(OBJEXT) BodyPipe.$(OBJEXT) \
-       ConfigParser.$(OBJEXT) store.$(OBJEXT) \
+       url.$(OBJEXT) AsyncCallQueue.$(OBJEXT) AsyncCall.$(OBJEXT) \
+       BodyPipe.$(OBJEXT) ConfigParser.$(OBJEXT) store.$(OBJEXT) \
        StoreFileSystem.$(OBJEXT) StoreSwapLogData.$(OBJEXT) \
        access_log.$(OBJEXT) acl.$(OBJEXT) acl_noncore.$(OBJEXT) \
        ACLChecklist.$(OBJEXT) ACLProxyAuth.$(OBJEXT) \
@@ -1472,10 +1477,10 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) mem.$(OBJEXT) \
        store_dir.$(OBJEXT) store_log.$(OBJEXT) \
        store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
        store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
-       SwapDir.$(OBJEXT) TextException.$(OBJEXT) tools.$(OBJEXT) \
-       $(am__objects_25) URLScheme.$(OBJEXT) urn.$(OBJEXT) \
-       useragent.$(OBJEXT) wccp.$(OBJEXT) wccp2.$(OBJEXT) \
-       whois.$(OBJEXT) wordlist.$(OBJEXT) $(am__objects_26)
+       SwapDir.$(OBJEXT) tools.$(OBJEXT) $(am__objects_25) \
+       URLScheme.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) \
+       wccp.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \
+       wordlist.$(OBJEXT) $(am__objects_26)
 nodist_ufsdump_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \
        string_arrays.$(OBJEXT)
 ufsdump_OBJECTS = $(am_ufsdump_OBJECTS) $(nodist_ufsdump_OBJECTS)
@@ -2088,8 +2093,14 @@ squid_COMMSOURCES = \
 libsquid_la_SOURCES = \
        comm.cc \
        comm.h \
+       CommCalls.cc \
+       CommCalls.h \
        IPInterception.cc \
-       IPInterception.h
+       IPInterception.h \
+        ICAP/AsyncJob.cc \
+        ICAP/AsyncJob.h \
+        TextException.cc \
+        TextException.h
 
 
 # authentication framework
@@ -2111,8 +2122,11 @@ squid_SOURCES = \
        ACLChecklist.h \
        $(squid_ACLSOURCES) \
        asn.cc \
+       AsyncCallQueue.cc \
+       AsyncCallQueue.h \
        AsyncCall.cc \
        AsyncCall.h \
+       AsyncJobCalls.h \
        AsyncEngine.cc \
        AsyncEngine.h \
        authenticate.cc \
@@ -2305,8 +2319,6 @@ squid_SOURCES = \
        structs.h \
        SwapDir.cc \
        SwapDir.h \
-       TextException.cc \
-       TextException.h \
        time.cc \
        tools.cc \
        tunnel.cc \
@@ -2378,8 +2390,6 @@ squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
        @ICAP_LIBS@
 
 ICAP_libicap_a_SOURCES = \
-       ICAP/AsyncJob.cc \
-       ICAP/AsyncJob.h \
        ICAP/ICAPClient.cc \
        ICAP/ICAPClient.h \
        ICAP/ICAPInitiator.cc \
@@ -2437,6 +2447,8 @@ ufsdump_SOURCES = \
        time.cc \
        ufsdump.cc \
        url.cc \
+       AsyncCallQueue.cc \
+       AsyncCallQueue.h \
        AsyncCall.cc \
        AsyncCall.h \
        BodyPipe.cc \
@@ -2566,8 +2578,6 @@ ufsdump_SOURCES = \
        store_swapout.cc \
        structs.h \
        SwapDir.cc \
-       TextException.cc \
-       TextException.h \
        tools.cc \
        typedefs.h \
        $(UNLINKDSOURCE) \
@@ -2856,6 +2866,8 @@ tests_testCacheManager_SOURCES = \
        ACLStringData.cc \
        ACLRegexData.cc \
        ACLUserData.cc \
+       AsyncCallQueue.cc \
+       AsyncCallQueue.h \
        AsyncCall.cc \
        authenticate.cc \
        BodyPipe.cc \
@@ -2957,7 +2969,6 @@ tests_testCacheManager_SOURCES = \
        StoreMetaURL.cc \
        StoreMetaVary.cc \
        StoreSwapLogData.cc \
-       TextException.cc \
        tools.cc \
        tunnel.cc \
        SwapDir.cc \
@@ -3030,6 +3041,8 @@ tests_testEvent_SOURCES = \
        ACLStringData.cc \
        ACLRegexData.cc \
        ACLUserData.cc \
+       AsyncCallQueue.cc \
+       AsyncCallQueue.h \
        AsyncCall.cc \
        authenticate.cc \
        BodyPipe.cc \
@@ -3130,7 +3143,6 @@ tests_testEvent_SOURCES = \
        StoreMetaURL.cc \
        StoreMetaVary.cc \
        StoreSwapLogData.cc \
-       TextException.cc \
        tools.cc \
        tunnel.cc \
        SwapDir.cc \
@@ -3188,6 +3200,8 @@ tests_testEventLoop_SOURCES = \
        ACLStringData.cc \
        ACLRegexData.cc \
        ACLUserData.cc \
+       AsyncCallQueue.cc \
+       AsyncCallQueue.h \
        AsyncCall.cc \
        authenticate.cc \
        BodyPipe.cc \
@@ -3288,7 +3302,6 @@ tests_testEventLoop_SOURCES = \
        StoreMetaURL.cc \
        StoreMetaVary.cc \
        StoreSwapLogData.cc \
-       TextException.cc \
        tools.cc \
        tunnel.cc \
        SwapDir.cc \
@@ -3367,6 +3380,8 @@ tests_test_http_range_SOURCES = \
        ACLStringData.cc \
        ACLRegexData.cc \
        ACLUserData.cc \
+       AsyncCallQueue.cc \
+       AsyncCallQueue.h \
        AsyncCall.cc \
        authenticate.cc \
        BodyPipe.cc \
@@ -3473,7 +3488,6 @@ tests_test_http_range_SOURCES = \
        StoreSwapLogData.cc \
        String.cc \
        SwapDir.cc \
-       TextException.cc \
        time.cc \
        tools.cc \
        tunnel.cc \
@@ -3531,6 +3545,8 @@ tests_testHttpRequest_SOURCES = \
        ACLStringData.cc \
        ACLRegexData.cc \
        ACLUserData.cc \
+       AsyncCallQueue.cc \
+       AsyncCallQueue.h \
        AsyncCall.cc \
        authenticate.cc \
        BodyPipe.cc \
@@ -3632,7 +3648,6 @@ tests_testHttpRequest_SOURCES = \
        StoreMetaURL.cc \
        StoreMetaVary.cc \
        StoreSwapLogData.cc \
-       TextException.cc \
        tools.cc \
        tunnel.cc \
        SwapDir.cc \
@@ -3903,6 +3918,8 @@ tests_testURL_SOURCES = \
        ACLStringData.cc \
        ACLRegexData.cc \
        ACLUserData.cc \
+       AsyncCallQueue.cc \
+       AsyncCallQueue.h \
        AsyncCall.cc \
        authenticate.cc \
        BodyPipe.cc \
@@ -4003,7 +4020,6 @@ tests_testURL_SOURCES = \
        StoreMetaURL.cc \
        StoreMetaVary.cc \
        StoreSwapLogData.cc \
-       TextException.cc \
        tools.cc \
        tunnel.cc \
        SwapDir.cc \
@@ -4080,8 +4096,6 @@ ICAP/$(am__dirstamp):
 ICAP/$(DEPDIR)/$(am__dirstamp):
        @$(mkdir_p) ICAP/$(DEPDIR)
        @: > ICAP/$(DEPDIR)/$(am__dirstamp)
-ICAP/AsyncJob.$(OBJEXT): ICAP/$(am__dirstamp) \
-       ICAP/$(DEPDIR)/$(am__dirstamp)
 ICAP/ICAPClient.$(OBJEXT): ICAP/$(am__dirstamp) \
        ICAP/$(DEPDIR)/$(am__dirstamp)
 ICAP/ICAPInitiator.$(OBJEXT): ICAP/$(am__dirstamp) \
@@ -4192,6 +4206,7 @@ clean-noinstLTLIBRARIES:
        done
 libauth.la: $(libauth_la_OBJECTS) $(libauth_la_DEPENDENCIES) 
        $(CXXLINK)  $(libauth_la_LDFLAGS) $(libauth_la_OBJECTS) $(libauth_la_LIBADD) $(LIBS)
+ICAP/AsyncJob.lo: ICAP/$(am__dirstamp) ICAP/$(DEPDIR)/$(am__dirstamp)
 libsquid.la: $(libsquid_la_OBJECTS) $(libsquid_la_DEPENDENCIES) 
        $(CXXLINK)  $(libsquid_la_LDFLAGS) $(libsquid_la_OBJECTS) $(libsquid_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
@@ -4628,6 +4643,7 @@ mostlyclean-compile:
        -rm -f DiskIO/ReadRequest.$(OBJEXT)
        -rm -f DiskIO/WriteRequest.$(OBJEXT)
        -rm -f ICAP/AsyncJob.$(OBJEXT)
+       -rm -f ICAP/AsyncJob.lo
        -rm -f ICAP/ICAPClient.$(OBJEXT)
        -rm -f ICAP/ICAPConfig.$(OBJEXT)
        -rm -f ICAP/ICAPElements.$(OBJEXT)
@@ -4762,6 +4778,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ACLUrlPort.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ACLUserData.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AsyncCall.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AsyncCallQueue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AsyncEngine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuthConfig.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuthScheme.Plo@am__quote@
@@ -4770,6 +4787,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BodyPipe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CacheDigest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChunkedCodingParser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CommCalls.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CompletionDispatcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigOption.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigParser.Po@am__quote@
@@ -4838,7 +4856,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StoreSwapLogData.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/String.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SwapDir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextException.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextException.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/URLScheme.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WinSvc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/access_log.Po@am__quote@
@@ -4961,7 +4979,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@DiskIO/DiskThreads/$(DEPDIR)/aiops.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@DiskIO/DiskThreads/$(DEPDIR)/aiops_win32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@DiskIO/DiskThreads/$(DEPDIR)/async_io.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@ICAP/$(DEPDIR)/AsyncJob.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ICAP/$(DEPDIR)/AsyncJob.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ICAP/$(DEPDIR)/ICAPClient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ICAP/$(DEPDIR)/ICAPConfig.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ICAP/$(DEPDIR)/ICAPElements.Po@am__quote@
@@ -5101,6 +5119,7 @@ mostlyclean-libtool:
 
 clean-libtool:
        -rm -rf .libs _libs
+       -rm -rf ICAP/.libs ICAP/_libs
 
 distclean-libtool:
        -rm -f libtool