--------------------- PatchSet 1539 Date: 2005/08/19 23:33:52 Author: rousskov Branch: squid3-icap Tag: (none) Log: - polished LOOPBACK/pipe->send() code separation - removed #define setting ICAP_ANCHOR_LOOPBACK to 1 in hope that -D works: make -DICAP_ANCHOR_LOOPBACK=1 Members: src/ICAPAnchor.cc:1.1.2.7->1.1.2.8 Index: squid3/src/ICAPAnchor.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/ICAPAnchor.cc,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- squid3/src/ICAPAnchor.cc 19 Aug 2005 23:14:32 -0000 1.1.2.7 +++ squid3/src/ICAPAnchor.cc 19 Aug 2005 23:33:52 -0000 1.1.2.8 @@ -7,9 +7,6 @@ #include "ICAPAnchor.h" #include "ICAPClient.h" -/* for testing */ -#define ICAP_ANCHOR_LOOPBACK 1 - CBDATA_CLASS_INIT(ICAPAnchor); @@ -42,7 +39,10 @@ adapted->data = new MsgPipeData; adapted->data->cause = request; // should not hurt - //ICAPInitXaction(virgin, adapted); +#if ICAP_ANCHOR_LOOPBACK +#else + ICAPInitXaction(virgin, adapted); +#endif virgin->sendSourceStart(); // we may have virgin data to provide adapted->sendSinkNeed(); // we want adapted response, eventially } @@ -63,13 +63,13 @@ debug(93,5)("ICAPAnchor::doneSending() called\n"); #if ICAP_ANCHOR_LOOPBACK - /* LOOPBACK */ /* simple assignments are not the right way to do this */ adapted->data->header = virgin->data->header; adapted->data->body = virgin->data->body; - noteSourceStart(adapted); noteSourceFinish(adapted); return; +#else + virgin->sendSourceFinish(); #endif }