---------------------
PatchSet 1460 
Date: 2005/06/16 10:27:13
Author: rmartinez
Branch: squid3-ipv6
Tag: (none) 
Log:
Updating Guido's patch

Members: 
	src/forward.cc:1.35.4.4->1.35.4.5 
	src/http.cc:1.43.4.4->1.43.4.5 
	src/icp_v2.cc:1.17.8.5->1.17.8.6 

Index: squid3/src/forward.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/forward.cc,v
retrieving revision 1.35.4.4
retrieving revision 1.35.4.5
diff -u -r1.35.4.4 -r1.35.4.5
--- squid3/src/forward.cc	5 May 2005 09:20:22 -0000	1.35.4.4
+++ squid3/src/forward.cc	16 Jun 2005 10:27:13 -0000	1.35.4.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.35.4.4 2005/05/05 09:20:22 rmartinez Exp $
+ * $Id: forward.cc,v 1.35.4.5 2005/06/16 10:27:13 rmartinez Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -879,7 +879,7 @@
         ch.my_addr = r->my_addr;
         ch.my_port = r->my_port;
         ch.request = requestLink(r);
-        ch.accessList = Config.accessList.miss;
+        ch.accessList = cbdataReference(Config.accessList.miss);
         answer = ch.fastCheck();
         ch.accessList = NULL;
 
Index: squid3/src/http.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/http.cc,v
retrieving revision 1.43.4.4
retrieving revision 1.43.4.5
diff -u -r1.43.4.4 -r1.43.4.5
--- squid3/src/http.cc	15 May 2005 14:22:46 -0000	1.43.4.4
+++ squid3/src/http.cc	16 Jun 2005 10:27:50 -0000	1.43.4.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.cc,v 1.43.4.4 2005/05/15 14:22:46 rmartinez Exp $
+ * $Id: http.cc,v 1.43.4.5 2005/06/16 10:27:50 rmartinez Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -1810,7 +1810,9 @@
     ACLChecklist ch;
     debug(11, 5) ("httpSendRequestEntityDone: FD %d\n", fd);
     ch.request = requestLink(httpState->request);
-    ch.accessList = Config.accessList.brokenPosts;
+
+    if (Config.accessList.brokenPosts)
+        ch.accessList = cbdataReference(Config.accessList.brokenPosts);
 
     if (!Config.accessList.brokenPosts) {
         debug(11, 5) ("httpSendRequestEntityDone: No brokenPosts list\n");
Index: squid3/src/icp_v2.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/icp_v2.cc,v
retrieving revision 1.17.8.5
retrieving revision 1.17.8.6
diff -u -r1.17.8.5 -r1.17.8.6
--- squid3/src/icp_v2.cc	22 May 2005 15:19:36 -0000	1.17.8.5
+++ squid3/src/icp_v2.cc	16 Jun 2005 10:28:29 -0000	1.17.8.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icp_v2.cc,v 1.17.8.5 2005/05/22 15:19:36 rmartinez Exp $
+ * $Id: icp_v2.cc,v 1.17.8.6 2005/06/16 10:28:29 rmartinez Exp $
  *
  * DEBUG: section 12    Internet Cache Protocol
  * AUTHOR: Duane Wessels
@@ -402,7 +402,7 @@
     checklist.src_addr = ADDR_FROM_SA(*from);
     checklist.my_addr = no_addr;
     checklist.request = requestLink(icp_request);
-    checklist.accessList = Config.accessList.icp;
+    checklist.accessList = cbdataReference(Config.accessList.icp);
     int result = checklist.fastCheck();
     checklist.accessList = NULL;
     return result;