From c16a5d1edb11da7bca19f3a9e3816d809ced9d40 Mon Sep 17 00:00:00 2001
From: serassio <>
Date: Mon, 21 Jan 2008 01:39:39 +0000
Subject: [PATCH] Merged changes from SQUID_3_0

---
 src/ICAP/ICAPModXact.cc |  2 +-
 src/cf.data.pre         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ICAP/ICAPModXact.cc b/src/ICAP/ICAPModXact.cc
index 99324cab84..90622d11eb 100644
--- a/src/ICAP/ICAPModXact.cc
+++ b/src/ICAP/ICAPModXact.cc
@@ -34,7 +34,7 @@ extern ICAPConfig TheICAPConfig;
 
 ICAPModXact::State::State()
 {
-    memset(this, sizeof(*this), 0);
+    memset(this, 0, sizeof(*this));
 }
 
 ICAPModXact::ICAPModXact(ICAPInitiator *anInitiator, HttpMsg *virginHeader,
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 01070d1702..f6c778efe0 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.488 2007/11/15 23:33:05 wessels Exp $
+# $Id: cf.data.pre,v 1.488.4.1 2008/01/20 18:39:39 serassio Exp $
 #
 # SQUID Web Proxy Cache		http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -1097,11 +1097,11 @@ DOC_START
 	source address 10.1.0.2 and the rest will be forwarded with
 	source address 10.1.0.3.
 
-	acl normal_service_net src 10.0.0.0/255.255.255.0
-	acl good_service_net src 10.0.1.0/255.255.255.0
-	tcp_outgoing_address 10.0.0.1 normal_service_net
-	tcp_outgoing_address 10.0.0.2 good_service_net
-	tcp_outgoing_address 10.0.0.3
+	acl normal_service_net src 10.0.0.0/24
+	acl good_service_net src 10.0.2.0/24
+	tcp_outgoing_address 10.1.0.1 normal_service_net
+	tcp_outgoing_address 10.1.0.2 good_service_net
+	tcp_outgoing_address 10.1.0.3
 
 	Processing proceeds in the order specified, and stops at first fully
 	matching line.
-- 
2.47.2