--------------------- PatchSet 3775 Date: 2006/09/19 17:18:29 Author: serassio Branch: nt Tag: (none) Log: Fix a forgotten change during recent comm layer rework Members: src/ICAP/ICAPXaction.cc:1.2.2.8->1.2.2.9 src/ICAP/ICAPXaction.h:1.2.2.6->1.2.2.7 Index: squid3/src/ICAP/ICAPXaction.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPXaction.cc,v retrieving revision 1.2.2.8 retrieving revision 1.2.2.9 diff -u -r1.2.2.8 -r1.2.2.9 --- squid3/src/ICAP/ICAPXaction.cc 28 Apr 2006 07:39:51 -0000 1.2.2.8 +++ squid3/src/ICAP/ICAPXaction.cc 19 Sep 2006 17:18:29 -0000 1.2.2.9 @@ -177,8 +177,8 @@ void ICAPXaction::scheduleWrite(MemBuf &buf) { // comm module will free the buffer - writer = &ICAPXaction_noteCommWrote; - comm_old_write_mbuf(connection, &buf, writer, this); + writer = (IOCB *)&ICAPXaction_noteCommWrote; + comm_write_mbuf(connection, &buf, writer, this); fd_table[connection].noteUse(icapPconnPool); commSetTimeout(connection, 61, &ICAPXaction_noteCommTimedout, this); } Index: squid3/src/ICAP/ICAPXaction.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPXaction.h,v retrieving revision 1.2.2.6 retrieving revision 1.2.2.7 diff -u -r1.2.2.6 -r1.2.2.7 --- squid3/src/ICAP/ICAPXaction.h 7 Aug 2006 10:10:36 -0000 1.2.2.6 +++ squid3/src/ICAP/ICAPXaction.h 19 Sep 2006 17:18:29 -0000 1.2.2.7 @@ -1,6 +1,6 @@ /* - * $Id: ICAPXaction.h,v 1.2.2.6 2006/08/07 10:10:36 serassio Exp $ + * $Id: ICAPXaction.h,v 1.2.2.7 2006/09/19 17:18:29 serassio Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -131,7 +131,7 @@ // active (pending) comm callbacks for the ICAP server connection CNCB *connector; IOCB *reader; - CWCB *writer; + IOCB *writer; PF *closer; const char *typeName; // the type of the final class (child), for debugging