---------------------
PatchSet 1952 
Date: 2005/10/17 22:34:13
Author: rousskov
Branch: squid3-icap
Tag: (none) 
Log:
- Added ICAPElements to encapsulated common trivial types and constants used
  by ICAP code. The initial contents was moved from ICAPServerRep and
  ICAPClient.

Members: 
	src/ICAPElements.cc:1.1->1.1.2.1 
	src/ICAPElements.h:1.1->1.1.2.1 
	src/Makefile.am:1.60.4.12->1.60.4.13 

--- /dev/null	Wed Feb 14 13:33:00 2007
+++ squid3/src/ICAPElements.cc	Wed Feb 14 13:35:22 2007
@@ -0,0 +1,4 @@
+#include "squid.h"
+#include "ICAPElements.h"
+
+const char *ICAP::crlf = "\r\n";
--- /dev/null	Wed Feb 14 13:33:00 2007
+++ squid3/src/ICAPElements.h	Wed Feb 14 13:35:22 2007
@@ -0,0 +1,53 @@
+
+/*
+ * $Id: ICAPElements.h,v 1.1.2.1 2005/10/17 22:34:13 rousskov Exp $
+ *
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sinks; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#ifndef SQUID_ICAPELEMENTS_H
+#define SQUID_ICAPELEMENTS_H
+
+// ICAP-related things shared by many ICAP classes
+
+// A "fake" class to encapsulate ICAP-related declarations without
+// adding namespaces to Squid. Eventually, namespaces should be added.
+
+struct ICAP
+{
+    typedef enum { methodNone, methodReqmod, methodRespmod, methodOptions } Method;
+    typedef enum { pointNone, pointPreCache, pointPostCache } VectPoint;
+
+    // recommended initial size and max capacity for MsgPipe buffer
+    enum { MsgPipeBufSizeMin = (4*1024), MsgPipeBufSizeMax = SQUID_TCP_SO_RCVBUF };
+
+    static const char *crlf;
+};
+
+#endif /* SQUID_ICAPCLIENT_H */
Index: squid3/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v
retrieving revision 1.60.4.12
retrieving revision 1.60.4.13
diff -u -r1.60.4.12 -r1.60.4.13
--- squid3/src/Makefile.am	27 Sep 2005 20:40:57 -0000	1.60.4.12
+++ squid3/src/Makefile.am	17 Oct 2005 22:34:13 -0000	1.60.4.13
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.60.4.12 2005/09/27 20:40:57 dwsquid Exp $
+#  $Id: Makefile.am,v 1.60.4.13 2005/10/17 22:34:13 rousskov Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -97,7 +97,10 @@
 	ICAPAnchor.cc \
 	ICAPClientSideHook.cc \
 	ICAPClient.cc \
+	ICAPElements.cc \
 	ICAPXaction.cc \
+	ICAPOptXact.cc \
+	ICAPModXact.cc \
 	ICAPServiceRep.cc \
 	ICAPConfig.cc \
 	ICAPOptions.cc \