---------------------
PatchSet 5958 
Date: 2003/09/24 19:35:01
Author: dwsquid
Branch: icap-2_5
Tag: (none) 
Log:
Added 'icap_preview_enable' directive to allow Squid the option
of never supporting ICAP preview mode.

Members: 
	src/cf.data.pre:1.49.2.33.2.10->1.49.2.33.2.11 
	src/icap_respmod.c:1.1.2.4->1.1.2.5 
	src/structs.h:1.48.2.9.2.11->1.48.2.9.2.12 

Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cf.data.pre,v
retrieving revision 1.49.2.33.2.10
retrieving revision 1.49.2.33.2.11
diff -u -r1.49.2.33.2.10 -r1.49.2.33.2.11
--- squid/src/cf.data.pre	14 Sep 2003 01:36:27 -0000	1.49.2.33.2.10
+++ squid/src/cf.data.pre	24 Sep 2003 19:35:01 -0000	1.49.2.33.2.11
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.49.2.33.2.10 2003/09/14 01:36:27 dwsquid Exp $
+# $Id: cf.data.pre,v 1.49.2.33.2.11 2003/09/24 19:35:01 dwsquid Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -2555,6 +2555,17 @@
 	If you want to enable the icap client module, set this to on
 DOC_END
 
+NAME: icap_preview_enable
+TYPE: onoff
+IFDEF: HS_FEAT_ICAP
+COMMENT: on|off
+LOC: Config.icapcfg.preview_enable
+DEFAULT: on
+DOC_START
+	Set this to 'off' if you want to disable the ICAP preview
+	feature in Squid.
+DOC_END
+
 NAME: icap_preview_size
 TYPE: int
 IFDEF: HS_FEAT_ICAP
Index: squid/src/icap_respmod.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/icap_respmod.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- squid/src/icap_respmod.c	23 Sep 2003 23:48:55 -0000	1.1.2.4
+++ squid/src/icap_respmod.c	24 Sep 2003 19:35:02 -0000	1.1.2.5
@@ -1,5 +1,5 @@
 /*
- * $Id: icap_respmod.c,v 1.1.2.4 2003/09/23 23:48:55 dwsquid Exp $
+ * $Id: icap_respmod.c,v 1.1.2.5 2003/09/24 19:35:02 dwsquid Exp $
  *
  * DEBUG: section 81    Internet Content Adaptation Protocol (ICAP) Client
  * AUTHOR: Geetha Manjunath, Hewlett Packard Company
@@ -111,8 +111,9 @@
 #else
 	getICAPRespModString(mb, 0, o2, -1, service->uri, client_addr);
 #endif
-    if (icap->preview_size >= 0)
-	memBufPrintf(mb, "Preview: %d\r\n", icap->preview_size);
+    if (Config.icapcfg.preview_enable)
+	if (icap->preview_size >= 0)
+	    memBufPrintf(mb, "Preview: %d\r\n", icap->preview_size);
 
     memBufAppend(mb, "Connection: close\r\n", 19);
     memBufAppend(mb, crlf, 2);
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.48.2.9.2.11
retrieving revision 1.48.2.9.2.12
diff -u -r1.48.2.9.2.11 -r1.48.2.9.2.12
--- squid/src/structs.h	23 Sep 2003 22:41:16 -0000	1.48.2.9.2.11
+++ squid/src/structs.h	24 Sep 2003 19:35:02 -0000	1.48.2.9.2.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.48.2.9.2.11 2003/09/23 22:41:16 dwsquid Exp $
+ * $Id: structs.h,v 1.48.2.9.2.12 2003/09/24 19:35:02 dwsquid Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -377,6 +377,7 @@
 #if HS_FEAT_ICAP
 struct _IcapConfig {
     int onoff;
+    int preview_enable;
     icap_service *service_head;
     /* icap_service_list *service_list_head; */
     icap_class *class_head;