---------------------
PatchSet 6034 
Date: 2003/11/14 01:34:36
Author: dwsquid
Branch: icap-2_5
Tag: (none) 
Log:
icap->flags.icap_server_eof is unused.  changing them to http_server_eof
in icapReadReply2().

Members: 
	src/icap_respmod.c:1.1.2.22->1.1.2.23 
	src/structs.h:1.48.2.9.2.20->1.48.2.9.2.21 

Index: squid/src/icap_respmod.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/icap_respmod.c,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- squid/src/icap_respmod.c	14 Nov 2003 00:37:35 -0000	1.1.2.22
+++ squid/src/icap_respmod.c	14 Nov 2003 01:34:36 -0000	1.1.2.23
@@ -1,5 +1,5 @@
 /*
- * $Id: icap_respmod.c,v 1.1.2.22 2003/11/14 00:37:35 dwsquid Exp $
+ * $Id: icap_respmod.c,v 1.1.2.23 2003/11/14 01:34:36 dwsquid Exp $
  *
  * DEBUG: section 81    Internet Content Adaptation Protocol (ICAP) Client
  * AUTHOR: Geetha Manjunath, Hewlett Packard Company
@@ -784,7 +784,7 @@
 	err->xerrno = errno;
 	err->request = requestLink((request_t *) request);
 	errorAppendEntry(entry, err);
-	icap->flags.icap_server_eof = 1;
+	icap->flags.http_server_eof = 1;
 	return -1;
     }
     if (icap->chunk_buf.size == 0) {
@@ -792,7 +792,7 @@
 	if (icapHttpReplyHdrState(icap) < 2)
 	    icapProcessHttpReplyHeader(icap, icap->chunk_buf.buf, icap->chunk_buf.size);
 	storeComplete(entry);
-	icap->flags.icap_server_eof = 1;
+	icap->flags.http_server_eof = 1;
 	return -1;
     }
     if (icapHttpReplyHdrState(icap) == 0) {
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.48.2.9.2.20
retrieving revision 1.48.2.9.2.21
diff -u -r1.48.2.9.2.20 -r1.48.2.9.2.21
--- squid/src/structs.h	7 Nov 2003 05:52:53 -0000	1.48.2.9.2.20
+++ squid/src/structs.h	14 Nov 2003 01:34:36 -0000	1.48.2.9.2.21
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.48.2.9.2.20 2003/11/07 05:52:53 dwsquid Exp $
+ * $Id: structs.h,v 1.48.2.9.2.21 2003/11/14 01:34:36 dwsquid Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1035,7 +1035,6 @@
 	unsigned int connect_pending:1;
 	unsigned int write_pending:1;
 	unsigned int keep_alive:1;
-	unsigned int icap_server_eof:1;
 	unsigned int http_server_eof:1;
 	unsigned int send_zero_chunk:1;
 	unsigned int got_reply:1;