Ooops, ICAPAnchor should really be ICAPClientRespmodPrecache and

ICAPClientSideHook should really be ICAPClientReqmodPrecache

diff --git a/src/ICAP/ChunkedCodingParser.h b/src/ICAP/ChunkedCodingParser.h
index cee85f3de05fcacf750ec1dd2d9f2deeda1ff3da..a935aa676dde0d2bf0c6634796b4980e24851f3c 100644 (file)
--- a/src/ICAP/ChunkedCodingParser.h
+++ b/src/ICAP/ChunkedCodingParser.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ChunkedCodingParser.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ChunkedCodingParser.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  * 
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

diff --git a/src/ICAP/ICAPClient.h b/src/ICAP/ICAPClient.h
index 1ac9c00eb1cd4dc297c0b31b2a328724a2c7b411..a8ecf66576291a87a9fd806fda95089b67644c9f 100644 (file)
--- a/src/ICAP/ICAPClient.h
+++ b/src/ICAP/ICAPClient.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPClient.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPClient.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/ICAPClientSideHook.cc b/src/ICAP/ICAPClientReqmodPrecache.cc
similarity index 67%
rename from src/ICAP/ICAPClientSideHook.cc
rename to src/ICAP/ICAPClientReqmodPrecache.cc
index f6eb9dda6d973fc0523d5ca259754ec7c35f633b..1c98c771682e2b3fd21c8ec78d303efb7b424eb3 100644 (file)
--- a/src/ICAP/ICAPClientSideHook.cc
+++ b/src/ICAP/ICAPClientReqmodPrecache.cc
@@ -6,7 +6,7 @@
 #include "MsgPipeSource.h"
 #include "MsgPipeSink.h"
 #include "HttpRequest.h"
-#include "ICAPClientSideHook.h"
+#include "ICAPClientReqmodPrecache.h"
 #include "ICAPServiceRep.h"
 #include "ICAPClient.h"
 
@@ -14,18 +14,18 @@
 
 extern LeakFinder *MsgPipeLeaker;
 
-CBDATA_CLASS_INIT(ICAPClientSideHook);
+CBDATA_CLASS_INIT(ICAPClientReqmodPrecache);
 
-ICAPClientSideHook::ICAPClientSideHook(ICAPServiceRep::Pointer aService): service(aService), http(NULL), virgin(NULL), adapted(NULL)
+ICAPClientReqmodPrecache::ICAPClientReqmodPrecache(ICAPServiceRep::Pointer aService): service(aService), http(NULL), virgin(NULL), adapted(NULL)
 {
-    debug(93,3)("ICAPClientSideHook constructed, this=%p\n", this);
+    debug(93,3)("ICAPClientReqmodPrecache constructed, this=%p\n", this);
 }
 
-ICAPClientSideHook::~ICAPClientSideHook()
+ICAPClientReqmodPrecache::~ICAPClientReqmodPrecache()
 {
     stop(notifyNone);
     cbdataReferenceDone(http);
-    debug(93,3)("ICAPClientSideHook destructed, this=%p\n", this);
+    debug(93,3)("ICAPClientReqmodPrecache destructed, this=%p\n", this);
 
     if (virgin != NULL)
         freeVirgin();
@@ -34,9 +34,9 @@ ICAPClientSideHook::~ICAPClientSideHook()
         freeAdapted();
 }
 
-void ICAPClientSideHook::startReqMod(ClientHttpRequest *aHttp, HttpRequest *request)
+void ICAPClientReqmodPrecache::startReqMod(ClientHttpRequest *aHttp, HttpRequest *request)
 {
-    debug(93,3)("ICAPClientSideHook::startReqMod() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::startReqMod() called\n");
     http = cbdataReference(aHttp);
 
     virgin = new MsgPipe("virgin"); // this is the place to create a refcount ptr
@@ -58,9 +58,9 @@ void ICAPClientSideHook::startReqMod(ClientHttpRequest *aHttp, HttpRequest *requ
     adapted->sendSinkNeed();   // we want adapted response, eventially
 }
 
-void ICAPClientSideHook::sendMoreData(StoreIOBuffer buf)
+void ICAPClientReqmodPrecache::sendMoreData(StoreIOBuffer buf)
 {
-    debug(93,3)("ICAPClientSideHook::sendMoreData() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::sendMoreData() called\n");
     //buf.dump();
     /*
      * The caller is responsible for not giving us more data
@@ -73,7 +73,7 @@ void ICAPClientSideHook::sendMoreData(StoreIOBuffer buf)
 }
 
 int
-ICAPClientSideHook::potentialSpaceSize()
+ICAPClientReqmodPrecache::potentialSpaceSize()
 {
     if (virgin == NULL)
         return 0;
@@ -84,25 +84,25 @@ ICAPClientSideHook::potentialSpaceSize()
 }
 
 // ClientHttpRequest says we have the entire HTTP message
-void ICAPClientSideHook::doneSending()
+void ICAPClientReqmodPrecache::doneSending()
 {
-    debug(93,3)("ICAPClientSideHook::doneSending() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::doneSending() called\n");
     leakTouch(virgin.getRaw(), MsgPipeLeaker);
 
     virgin->sendSourceFinish();
 }
 
 // ClientHttpRequest tells us to abort
-void ICAPClientSideHook::ownerAbort()
+void ICAPClientReqmodPrecache::ownerAbort()
 {
-    debug(93,3)("ICAPClientSideHook::ownerAbort() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::ownerAbort() called\n");
     stop(notifyIcap);
 }
 
 // ICAP client needs more virgin response data
-void ICAPClientSideHook::noteSinkNeed(MsgPipe *p)
+void ICAPClientReqmodPrecache::noteSinkNeed(MsgPipe *p)
 {
-    debug(93,3)("ICAPClientSideHook::noteSinkNeed() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::noteSinkNeed() called\n");
 
     leakTouch(virgin.getRaw(), MsgPipeLeaker);
 
@@ -111,26 +111,26 @@ void ICAPClientSideHook::noteSinkNeed(MsgPipe *p)
 }
 
 // ICAP client aborting
-void ICAPClientSideHook::noteSinkAbort(MsgPipe *p)
+void ICAPClientReqmodPrecache::noteSinkAbort(MsgPipe *p)
 {
-    debug(93,3)("ICAPClientSideHook::noteSinkAbort() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::noteSinkAbort() called\n");
     stop(notifyOwner);
 }
 
 // ICAP client starts sending adapted response
 // ICAP client has received new HTTP headers (if any) at this point
-void ICAPClientSideHook::noteSourceStart(MsgPipe *p)
+void ICAPClientReqmodPrecache::noteSourceStart(MsgPipe *p)
 {
-    debug(93,3)("ICAPClientSideHook::noteSourceStart() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::noteSourceStart() called\n");
     leakTouch(adapted.getRaw(), MsgPipeLeaker);
     http->takeAdaptedHeaders(adapted->data->header);
     noteSourceProgress(p);
 }
 
 // ICAP client sends more data
-void ICAPClientSideHook::noteSourceProgress(MsgPipe *p)
+void ICAPClientReqmodPrecache::noteSourceProgress(MsgPipe *p)
 {
-    debug(93,3)("ICAPClientSideHook::noteSourceProgress() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::noteSourceProgress() called\n");
     //tell ClientHttpRequest to store a fresh portion of the adapted response
 
     leakTouch(p, MsgPipeLeaker);
@@ -141,9 +141,9 @@ void ICAPClientSideHook::noteSourceProgress(MsgPipe *p)
 }
 
 // ICAP client is done sending adapted response
-void ICAPClientSideHook::noteSourceFinish(MsgPipe *p)
+void ICAPClientReqmodPrecache::noteSourceFinish(MsgPipe *p)
 {
-    debug(93,3)("ICAPClientSideHook::noteSourceFinish() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::noteSourceFinish() called\n");
     //tell ClientHttpRequest that we expect no more response data
     leakTouch(p, MsgPipeLeaker);
     http->doneAdapting();
@@ -151,15 +151,15 @@ void ICAPClientSideHook::noteSourceFinish(MsgPipe *p)
 }
 
 // ICAP client is aborting
-void ICAPClientSideHook::noteSourceAbort(MsgPipe *p)
+void ICAPClientReqmodPrecache::noteSourceAbort(MsgPipe *p)
 {
-    debug(93,3)("ICAPClientSideHook::noteSourceAbort() called\n");
+    debug(93,3)("ICAPClientReqmodPrecache::noteSourceAbort() called\n");
     leakTouch(p, MsgPipeLeaker);
     stop(notifyOwner);
 }
 
 // internal cleanup
-void ICAPClientSideHook::stop(Notify notify)
+void ICAPClientReqmodPrecache::stop(Notify notify)
 {
     if (virgin != NULL) {
         leakTouch(virgin.getRaw(), MsgPipeLeaker);
@@ -194,7 +194,7 @@ void ICAPClientSideHook::stop(Notify notify)
     }
 }
 
-void ICAPClientSideHook::freeVirgin()
+void ICAPClientReqmodPrecache::freeVirgin()
 {
     // virgin->data->cause should be NULL;
     requestUnlink(dynamic_cast<HttpRequest*>(virgin->data->header));
@@ -203,7 +203,7 @@ void ICAPClientSideHook::freeVirgin()
     virgin = NULL;     // refcounted
 }
 
-void ICAPClientSideHook::freeAdapted()
+void ICAPClientReqmodPrecache::freeAdapted()
 {
     adapted->data->header = NULL;      // we don't own it
     leakTouch(adapted.getRaw(), MsgPipeLeaker);

diff --git a/src/ICAP/ICAPClientSideHook.h b/src/ICAP/ICAPClientReqmodPrecache.h
similarity index 87%
rename from src/ICAP/ICAPClientSideHook.h
rename to src/ICAP/ICAPClientReqmodPrecache.h
index f3c4c8af421b2fd1fbb1209a81558c8a6de43a26..3e531d0bc8e3d985bc47c4ca2d08023a882ebeae 100644 (file)
--- a/src/ICAP/ICAPClientSideHook.h
+++ b/src/ICAP/ICAPClientReqmodPrecache.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPClientSideHook.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPClientReqmodPrecache.h,v 1.1 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -38,24 +38,24 @@
 #include "MsgPipeSource.h"
 #include "MsgPipeSink.h"
 
-/* The ICAP ClientSideHook implements message pipe sink and source interfaces.  It
+/* The ICAP ClientReqmodPrecache implements message pipe sink and source interfaces.  It
  * helps client-side to marshall the incoming/virgin HTTP message (being
  * recieved from the HTTP client) to Squid's ICAP client module, using the
  * MsgPipe interface. The same interface is used to get the adapted HTTP
  * message back from the ICAP client. client-side is the "owner" of the
- * ICAPClientSideHook.
+ * ICAPClientReqmodPrecache.
  */
 
 class HttpRequest;
 
 class ClientRequestContext;
 
-class ICAPClientSideHook: public MsgPipeSource, public MsgPipeSink
+class ICAPClientReqmodPrecache: public MsgPipeSource, public MsgPipeSink
 {
 
 public:
-    ICAPClientSideHook(ICAPServiceRep::Pointer);
-    virtual ~ICAPClientSideHook();
+    ICAPClientReqmodPrecache(ICAPServiceRep::Pointer);
+    virtual ~ICAPClientReqmodPrecache();
 
     // synchronous calls called by ClientHttpRequest
     void startReqMod(ClientHttpRequest *, HttpRequest *);
@@ -85,7 +85,7 @@ private:
     void stop(Notify notify);
     void freeVirgin();
     void freeAdapted();
-    CBDATA_CLASS2(ICAPClientSideHook);
+    CBDATA_CLASS2(ICAPClientReqmodPrecache);
 };
 
 #endif /* SQUID_ICAPCLIENTSIDEHOOK_H */

diff --git a/src/ICAP/ICAPAnchor.cc b/src/ICAP/ICAPClientRespmodPrecache.cc
similarity index 72%
rename from src/ICAP/ICAPAnchor.cc
rename to src/ICAP/ICAPClientRespmodPrecache.cc
index d1080bd3b1b2fdb005165df419dfac60a6976799..a340368be6ecb5d1c2d873315063a63013b6148b 100644 (file)
--- a/src/ICAP/ICAPAnchor.cc
+++ b/src/ICAP/ICAPClientRespmodPrecache.cc
@@ -6,26 +6,26 @@
 #include "MsgPipeSink.h"
 #include "HttpRequest.h"
 #include "HttpReply.h"
-#include "ICAPAnchor.h"
+#include "ICAPClientRespmodPrecache.h"
 #include "ICAPClient.h"
 #include "ICAPServiceRep.h"
 
 #include "LeakFinder.h"
 
-CBDATA_CLASS_INIT(ICAPAnchor);
+CBDATA_CLASS_INIT(ICAPClientRespmodPrecache);
 
 extern LeakFinder *MsgPipeLeaker;
 
-ICAPAnchor::ICAPAnchor(ICAPServiceRep::Pointer aService): service(aService), httpState(NULL), virgin(NULL), adapted(NULL)
+ICAPClientRespmodPrecache::ICAPClientRespmodPrecache(ICAPServiceRep::Pointer aService): service(aService), httpState(NULL), virgin(NULL), adapted(NULL)
 {
-    debug(93,5)("ICAPAnchor constructed, this=%p\n", this);
+    debug(93,5)("ICAPClientRespmodPrecache constructed, this=%p\n", this);
 }
 
-ICAPAnchor::~ICAPAnchor()
+ICAPClientRespmodPrecache::~ICAPClientRespmodPrecache()
 {
     stop(notifyNone);
     cbdataReferenceDone(httpState);
-    debug(93,5)("ICAPAnchor destructed, this=%p\n", this);
+    debug(93,5)("ICAPClientRespmodPrecache destructed, this=%p\n", this);
 
     if (virgin != NULL)
         freeVirgin();
@@ -36,7 +36,7 @@ ICAPAnchor::~ICAPAnchor()
     service = NULL;
 }
 
-void ICAPAnchor::startRespMod(HttpStateData *anHttpState, HttpRequest *request, HttpReply *reply)
+void ICAPClientRespmodPrecache::startRespMod(HttpStateData *anHttpState, HttpRequest *request, HttpReply *reply)
 {
     httpState = cbdataReference(anHttpState);
 
@@ -65,9 +65,9 @@ void ICAPAnchor::startRespMod(HttpStateData *anHttpState, HttpRequest *request,
     adapted->sendSinkNeed();   // we want adapted response, eventially
 }
 
-void ICAPAnchor::sendMoreData(StoreIOBuffer buf)
+void ICAPClientRespmodPrecache::sendMoreData(StoreIOBuffer buf)
 {
-    debug(93,5)("ICAPAnchor::sendMoreData() called\n");
+    debug(93,5)("ICAPClientRespmodPrecache::sendMoreData() called\n");
     //buf.dump();
     /*
      * The caller is responsible for not giving us more data
@@ -80,7 +80,7 @@ void ICAPAnchor::sendMoreData(StoreIOBuffer buf)
 }
 
 int
-ICAPAnchor::potentialSpaceSize()
+ICAPClientRespmodPrecache::potentialSpaceSize()
 {
     if (virgin == NULL)
         return 0;
@@ -91,9 +91,9 @@ ICAPAnchor::potentialSpaceSize()
 }
 
 // HttpStateData says we have the entire HTTP message
-void ICAPAnchor::doneSending()
+void ICAPClientRespmodPrecache::doneSending()
 {
-    debug(93,5)("ICAPAnchor::doneSending() called\n");
+    debug(93,5)("ICAPClientRespmodPrecache::doneSending() called\n");
 
 #if ICAP_ANCHOR_LOOPBACK
     /* simple assignments are not the right way to do this */
@@ -109,16 +109,16 @@ void ICAPAnchor::doneSending()
 }
 
 // HttpStateData tells us to abort
-void ICAPAnchor::ownerAbort()
+void ICAPClientRespmodPrecache::ownerAbort()
 {
-    debug(93,5)("ICAPAnchor::ownerAbort() called\n");
+    debug(93,5)("ICAPClientRespmodPrecache::ownerAbort() called\n");
     stop(notifyIcap);
 }
 
 // ICAP client needs more virgin response data
-void ICAPAnchor::noteSinkNeed(MsgPipe *p)
+void ICAPClientRespmodPrecache::noteSinkNeed(MsgPipe *p)
 {
-    debug(93,5)("ICAPAnchor::noteSinkNeed() called\n");
+    debug(93,5)("ICAPClientRespmodPrecache::noteSinkNeed() called\n");
 
     leakTouch(virgin.getRaw(), MsgPipeLeaker);
 
@@ -127,17 +127,17 @@ void ICAPAnchor::noteSinkNeed(MsgPipe *p)
 }
 
 // ICAP client aborting
-void ICAPAnchor::noteSinkAbort(MsgPipe *p)
+void ICAPClientRespmodPrecache::noteSinkAbort(MsgPipe *p)
 {
-    debug(93,5)("ICAPAnchor::noteSinkAbort() called\n");
+    debug(93,5)("ICAPClientRespmodPrecache::noteSinkAbort() called\n");
     stop(notifyOwner);
 }
 
 // ICAP client starts sending adapted response
 // ICAP client has received new HTTP headers (if any) at this point
-void ICAPAnchor::noteSourceStart(MsgPipe *p)
+void ICAPClientRespmodPrecache::noteSourceStart(MsgPipe *p)
 {
-    debug(93,5)("ICAPAnchor::noteSourceStart() called\n");
+    debug(93,5)("ICAPClientRespmodPrecache::noteSourceStart() called\n");
     leakTouch(adapted.getRaw(), MsgPipeLeaker);
 
     HttpReply *reply = dynamic_cast<HttpReply*>(adapted->data->header);
@@ -151,9 +151,9 @@ void ICAPAnchor::noteSourceStart(MsgPipe *p)
 }
 
 // ICAP client sends more data
-void ICAPAnchor::noteSourceProgress(MsgPipe *p)
+void ICAPClientRespmodPrecache::noteSourceProgress(MsgPipe *p)
 {
-    debug(93,5)("ICAPAnchor::noteSourceProgress() called\n");
+    debug(93,5)("ICAPClientRespmodPrecache::noteSourceProgress() called\n");
     //tell HttpStateData to store a fresh portion of the adapted response
 
     leakTouch(p, MsgPipeLeaker);
@@ -164,9 +164,9 @@ void ICAPAnchor::noteSourceProgress(MsgPipe *p)
 }
 
 // ICAP client is done sending adapted response
-void ICAPAnchor::noteSourceFinish(MsgPipe *p)
+void ICAPClientRespmodPrecache::noteSourceFinish(MsgPipe *p)
 {
-    debug(93,5)("ICAPAnchor::noteSourceFinish() called\n");
+    debug(93,5)("ICAPClientRespmodPrecache::noteSourceFinish() called\n");
     //tell HttpStateData that we expect no more response data
     leakTouch(p, MsgPipeLeaker);
     httpState->doneAdapting();
@@ -174,15 +174,15 @@ void ICAPAnchor::noteSourceFinish(MsgPipe *p)
 }
 
 // ICAP client is aborting
-void ICAPAnchor::noteSourceAbort(MsgPipe *p)
+void ICAPClientRespmodPrecache::noteSourceAbort(MsgPipe *p)
 {
-    debug(93,5)("ICAPAnchor::noteSourceAbort() called\n");
+    debug(93,5)("ICAPClientRespmodPrecache::noteSourceAbort() called\n");
     leakTouch(p, MsgPipeLeaker);
     stop(notifyOwner);
 }
 
 // internal cleanup
-void ICAPAnchor::stop(Notify notify)
+void ICAPClientRespmodPrecache::stop(Notify notify)
 {
     if (virgin != NULL) {
         leakTouch(virgin.getRaw(), MsgPipeLeaker);
@@ -217,7 +217,7 @@ void ICAPAnchor::stop(Notify notify)
     }
 }
 
-void ICAPAnchor::freeVirgin()
+void ICAPClientRespmodPrecache::freeVirgin()
 {
     requestUnlink(virgin->data->cause);
     virgin->data->cause = NULL;
@@ -226,7 +226,7 @@ void ICAPAnchor::freeVirgin()
     virgin = NULL;     // refcounted
 }
 
-void ICAPAnchor::freeAdapted()
+void ICAPClientRespmodPrecache::freeAdapted()
 {
     /*
      * Note on adapted->data->header.  ICAPXaction-side created it

diff --git a/src/ICAP/ICAPAnchor.h b/src/ICAP/ICAPClientRespmodPrecache.h
similarity index 90%
rename from src/ICAP/ICAPAnchor.h
rename to src/ICAP/ICAPClientRespmodPrecache.h
index d13b9e9a63c373fce930f299b97cc33b29344e0f..b994bf0e1df33b1909f7ee8a6bf6fd1bc66ba61d 100644 (file)
--- a/src/ICAP/ICAPAnchor.h
+++ b/src/ICAP/ICAPClientRespmodPrecache.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPAnchor.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPClientRespmodPrecache.h,v 1.1 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -44,19 +44,19 @@
  * recieved from the HTTP server) to Squid's ICAP client module, using the
  * MsgPipe interface. The same interface is used to get the adapted HTTP
  * message back from the ICAP client. HttpStateData is the "owner" of the
- * ICAPAnchor.
+ * ICAPClientRespmodPrecache.
  */
 
 class HttpRequest;
 
 class HttpReply;
 
-class ICAPAnchor: public MsgPipeSource, public MsgPipeSink
+class ICAPClientRespmodPrecache: public MsgPipeSource, public MsgPipeSink
 {
 
 public:
-    ICAPAnchor(ICAPServiceRep::Pointer);
-    virtual ~ICAPAnchor();
+    ICAPClientRespmodPrecache(ICAPServiceRep::Pointer);
+    virtual ~ICAPClientRespmodPrecache();
 
     // synchronous calls called by HttpStateData
     void startRespMod(HttpStateData *anHttpState, HttpRequest *request, HttpReply *reply);
@@ -86,7 +86,7 @@ private:
     void stop(Notify notify);
     void freeVirgin();
     void freeAdapted();
-    CBDATA_CLASS2(ICAPAnchor);
+    CBDATA_CLASS2(ICAPClientRespmodPrecache);
 };
 
 #endif /* SQUID_ICAPANCHOR_H */

diff --git a/src/ICAP/ICAPConfig.cc b/src/ICAP/ICAPConfig.cc
index 76aae039f22287b9638d3f6f864c41c2ecbac5b0..f98f864160fd1c9d129e80b7210e47f79b8e6616 100644 (file)
--- a/src/ICAP/ICAPConfig.cc
+++ b/src/ICAP/ICAPConfig.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPConfig.cc,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPConfig.cc,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------

diff --git a/src/ICAP/ICAPConfig.h b/src/ICAP/ICAPConfig.h
index 823ffedb79b0da871ca736a170047ae3d9abf8cb..d1c8188fb6e6e9ae7ed8b118915025931436d3a7 100644 (file)
--- a/src/ICAP/ICAPConfig.h
+++ b/src/ICAP/ICAPConfig.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPConfig.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPConfig.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/ICAPElements.h b/src/ICAP/ICAPElements.h
index c4b4b6d3aaf722a8606c9616eb754bae6c1286be..5ee1a79c2a5183594e49d86cfc65f1341dd92e15 100644 (file)
--- a/src/ICAP/ICAPElements.h
+++ b/src/ICAP/ICAPElements.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPElements.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPElements.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/ICAPModXact.cc b/src/ICAP/ICAPModXact.cc
index 91ea7b7119f634beffd338c1586ea196d8ea199d..062a04643f963b18b8bdb228261c5ca283c3d535 100644 (file)
--- a/src/ICAP/ICAPModXact.cc
+++ b/src/ICAP/ICAPModXact.cc
@@ -492,7 +492,7 @@ void ICAPModXact::stopSending(bool nicely)
 
     /*
     * Note on adapted->data->header:  we created the header, but allow the
-    * other side (ICAPAnchor) to take control of it.  We won't touch it here
+    * other side (ICAPClientRespmodPrecache) to take control of it.  We won't touch it here
     * and instead rely on the Anchor-side to make sure it is properly freed.
     */
     adapted = NULL; // refcounted

diff --git a/src/ICAP/ICAPModXact.h b/src/ICAP/ICAPModXact.h
index c2a5236b3f2c4b0e8c59d9c4709b1bbcb02b74fe..0031f2fbe45572485e3488ea1c76cc7658d62f8e 100644 (file)
--- a/src/ICAP/ICAPModXact.h
+++ b/src/ICAP/ICAPModXact.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPModXact.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPModXact.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/ICAPOptXact.h b/src/ICAP/ICAPOptXact.h
index 9befffc942505b9dc8ee900509133d904d169c03..d2bf8e2b6c093743e19652d6b5a7c111e5aef3ae 100644 (file)
--- a/src/ICAP/ICAPOptXact.h
+++ b/src/ICAP/ICAPOptXact.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ICAPOptXact.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPOptXact.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/ICAPOptions.h b/src/ICAP/ICAPOptions.h
index a57b4cf0654389a4c602bc5912df45e351626ebf..cf22aed25ec2ff2ee4e9043cbf36f5d73a32d14c 100644 (file)
--- a/src/ICAP/ICAPOptions.h
+++ b/src/ICAP/ICAPOptions.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPOptions.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPOptions.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/ICAPServiceRep.h b/src/ICAP/ICAPServiceRep.h
index 221289e01f360d2b75220878b2999933704d63d1..3f743a6626045053513a642b209c9762ad16bea7 100644 (file)
--- a/src/ICAP/ICAPServiceRep.h
+++ b/src/ICAP/ICAPServiceRep.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPServiceRep.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPServiceRep.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/ICAPXaction.h b/src/ICAP/ICAPXaction.h
index 41f068c8bd09454f977edb724d2309eade4466d2..b90f48a5aa6119509cb8de6a6bf9f2b038949530 100644 (file)
--- a/src/ICAP/ICAPXaction.h
+++ b/src/ICAP/ICAPXaction.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPXaction.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: ICAPXaction.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/MsgPipe.h b/src/ICAP/MsgPipe.h
index 2aa7c3332b32d14aeafeb258e5617bd588274c74..7164833de5eacff6430d6ff74136b4b684630025 100644 (file)
--- a/src/ICAP/MsgPipe.h
+++ b/src/ICAP/MsgPipe.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: MsgPipe.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: MsgPipe.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/MsgPipeData.h b/src/ICAP/MsgPipeData.h
index 473daa46f5a00216c6f1c8d662f45001477d4e12..18ee1fd78e49591462c2b83eb53bb819c810738e 100644 (file)
--- a/src/ICAP/MsgPipeData.h
+++ b/src/ICAP/MsgPipeData.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: MsgPipeData.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: MsgPipeData.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/MsgPipeEnd.h b/src/ICAP/MsgPipeEnd.h
index e47f48df196be7ac3ae5bf4b912c012ba8be7646..4fb74ccda4e43a51d399a782f081c85715b7b971 100644 (file)
--- a/src/ICAP/MsgPipeEnd.h
+++ b/src/ICAP/MsgPipeEnd.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: MsgPipeEnd.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: MsgPipeEnd.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/MsgPipeSink.h b/src/ICAP/MsgPipeSink.h
index b8f6ff9f25081ba775b445fdf6658b5d446c4c3e..f5c65cfaab2bbb88e5869f672bfc947dea83273b 100644 (file)
--- a/src/ICAP/MsgPipeSink.h
+++ b/src/ICAP/MsgPipeSink.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: MsgPipeSink.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: MsgPipeSink.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/

diff --git a/src/ICAP/MsgPipeSource.h b/src/ICAP/MsgPipeSource.h
index 58af6b5b0a7f4a17963c4ad240036dc34220e83f..21d4c986aac619535da1c51e09e0a4bb595097fd 100644 (file)
--- a/src/ICAP/MsgPipeSource.h
+++ b/src/ICAP/MsgPipeSource.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: MsgPipeSource.h,v 1.1 2005/11/21 23:32:59 wessels Exp $
+ * $Id: MsgPipeSource.h,v 1.2 2005/11/21 23:46:27 wessels Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/