Merged changes from SQUID_3_0

diff --git a/src/ICAP/ICAPModXact.cc b/src/ICAP/ICAPModXact.cc
index 99324cab8455e340b89885f6fc2c8910a007dba3..90622d11eb9a78fd3d1dc3abb6026f4ae7fa5e7f 100644 (file)
--- 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 01070d1702231cd5aab8bd4d28ce56a8f1760150..f6c778efe07fe07de49af0f130932ef4ea1c2631 100644 (file)
--- 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.