---------------------
PatchSet 1914 
Date: 2005/10/01 04:54:09
Author: dwsquid
Branch: squid3-icap
Tag: (none) 
Log:
protect HttpStateData::icapAccessCheckPending inside ICAP_CLIENT #ifdefs

Members: 
	src/http.cc:1.49.2.39->1.49.2.40 
	src/http.h:1.11.4.12->1.11.4.13 

Index: squid3/src/http.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/http.cc,v
retrieving revision 1.49.2.39
retrieving revision 1.49.2.40
diff -u -r1.49.2.39 -r1.49.2.40
--- squid3/src/http.cc	30 Sep 2005 21:57:15 -0000	1.49.2.39
+++ squid3/src/http.cc	1 Oct 2005 04:54:09 -0000	1.49.2.40
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.49.2.39 2005/09/30 21:57:15 dwsquid Exp $
+ * $Id: http.cc,v 1.49.2.40 2005/10/01 04:54:09 dwsquid Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -1130,8 +1130,10 @@
         return;
     }
 
+#if ICAP_CLIENT
     if (icapAccessCheckPending)
         return;
+#endif
 
     /*
      * At this point the reply headers have been parsed and consumed.
Index: squid3/src/http.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/http.h,v
retrieving revision 1.11.4.12
retrieving revision 1.11.4.13
diff -u -r1.11.4.12 -r1.11.4.13
--- squid3/src/http.h	29 Sep 2005 18:00:44 -0000	1.11.4.12
+++ squid3/src/http.h	1 Oct 2005 04:54:09 -0000	1.11.4.13
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.h,v 1.11.4.12 2005/09/29 18:00:44 dwsquid Exp $
+ * $Id: http.h,v 1.11.4.13 2005/10/01 04:54:09 dwsquid Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -79,13 +79,13 @@
     MemBuf *readBuf;
     bool ignoreCacheControl;
     bool surrogateNoStore;
-    bool icapAccessCheckPending;
     void processSurrogateControl(HttpReply *);
 #if ICAP_CLIENT
 
     ICAPAnchor *icap;
     ICAPAccessCheck *icap_access_check;
     void icapAclCheckDone(ICAPServiceRep::Pointer);
+    bool icapAccessCheckPending;
 #endif
 
     /*