---------------------
PatchSet 5892 
Date: 2003/08/21 20:45:39
Author: dwsquid
Branch: icap-2_5
Tag: (none) 
Log:
change icap->reqmod to icap->flags.reqmod

Members: 
	src/http.c:1.17.6.3.6.5->1.17.6.3.6.6 
	src/icap.c:1.1.16.8->1.1.16.9 
	src/structs.h:1.48.2.9.2.6->1.48.2.9.2.7 

Index: squid/src/http.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/http.c,v
retrieving revision 1.17.6.3.6.5
retrieving revision 1.17.6.3.6.6
diff -u -r1.17.6.3.6.5 -r1.17.6.3.6.6
--- squid/src/http.c	27 Jun 2003 01:15:18 -0000	1.17.6.3.6.5
+++ squid/src/http.c	21 Aug 2003 20:45:39 -0000	1.17.6.3.6.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.c,v 1.17.6.3.6.5 2003/06/27 01:15:18 hno Exp $
+ * $Id: http.c,v 1.17.6.3.6.6 2003/08/21 20:45:39 dwsquid Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -696,7 +696,7 @@
 	 * we probably can finish this request
 	 */
 	icap = httpState->icap;
-	if (icap && icap->reqmod && icap->enc_null_body >= 0 && httpState->reply_hdr_state == 2) {
+	if (icap && icap->flags.reqmod && icap->enc_null_body >= 0 && httpState->reply_hdr_state == 2) {
 	    fwdComplete(httpState->fwd);
 	    comm_close(fd);
 	    return;
@@ -714,7 +714,7 @@
 	    /* yes we have to clear all these! */
 #ifdef HS_FEAT_ICAP
 	    /* only enter respmod if we are not in reqmod mode */
-	    if (httpState->icap && !httpState->icap->reqmod && httpState->icap->http_fd == fd) {
+	    if (httpState->icap && !httpState->icap->flags.reqmod && httpState->icap->http_fd == fd) {
 		icapSendRespMod(httpState, buf, len, 1);
 		return;
 	    }
@@ -734,7 +734,7 @@
 	} else {
 #ifdef HS_FEAT_ICAP
 	    /* don't enter respmod for reqmod replies from icap server */
-	    if (httpState->icap && !httpState->icap->reqmod && httpState->icap->http_fd == fd) {
+	    if (httpState->icap && !httpState->icap->flags.reqmod && httpState->icap->http_fd == fd) {
 		icapSendRespMod(httpState, buf, len, 0);
 	    } else
 #endif
Index: squid/src/icap.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/icap.c,v
retrieving revision 1.1.16.8
retrieving revision 1.1.16.9
diff -u -r1.1.16.8 -r1.1.16.9
--- squid/src/icap.c	21 Aug 2003 20:43:09 -0000	1.1.16.8
+++ squid/src/icap.c	21 Aug 2003 20:45:39 -0000	1.1.16.9
@@ -1,5 +1,5 @@
 /*
- * $Id: icap.c,v 1.1.16.8 2003/08/21 20:43:09 dwsquid Exp $
+ * $Id: icap.c,v 1.1.16.9 2003/08/21 20:45:39 dwsquid Exp $
  *
  * DEBUG: section 81    Internet Content Adaptation Protocol (ICAP) Client
  * AUTHOR: Geetha Manjunath, Hewlett Packard Company
@@ -463,7 +463,7 @@
 	return -1;
 
     icap->current_service = service;
-    icap->reqmod = 1;
+    icap->flags.reqmod = 1;
     icap->http_fd = httpState->fd;
     httpState->icap = icap;
 
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.48.2.9.2.6
retrieving revision 1.48.2.9.2.7
diff -u -r1.48.2.9.2.6 -r1.48.2.9.2.7
--- squid/src/structs.h	9 Jul 2003 19:24:45 -0000	1.48.2.9.2.6
+++ squid/src/structs.h	21 Aug 2003 20:45:39 -0000	1.48.2.9.2.7
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.48.2.9.2.6 2003/07/09 19:24:45 hno Exp $
+ * $Id: structs.h,v 1.48.2.9.2.7 2003/08/21 20:45:39 dwsquid Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -993,10 +993,12 @@
     int enc_res_hdr;
     int enc_null_body;
     int enc_res_body;
-    ushort reqmod;
     MemBuf buffer;
     int chunk_size;
     int preview_size;
+    struct {
+	unsigned int reqmod:1;
+    } flags;
 };
 
 struct _icap_service {