From: serassio <>
Date: Sun, 10 Feb 2008 17:07:53 +0000 (+0000)
Subject: Merged changes from SQUID_3_0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c189bccf56bdcc09f935984f79dce15b3e610fb6;p=thirdparty%2Fsquid.git

Merged changes from SQUID_3_0
---

diff --git a/src/ACLHTTPRepHeader.cc b/src/ACLHTTPRepHeader.cc
index 9935c40f59..d26ae22132 100644
--- a/src/ACLHTTPRepHeader.cc
+++ b/src/ACLHTTPRepHeader.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLHTTPRepHeader.cc,v 1.1 2006/06/14 19:18:24 serassio Exp $
+ * $Id: ACLHTTPRepHeader.cc,v 1.1.6.1 2008/02/10 10:07:53 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -39,12 +39,6 @@
 #include "ACLChecklist.h"
 #include "HttpReply.h"
 
-/* explicit template instantiation required for some systems */
-
-template class ACLStrategised<HttpHeader*>
-
-;
-
 ACL::Prototype ACLHTTPRepHeader::RegistryProtoype(&ACLHTTPRepHeader::RegistryEntry_, "rep_header");
 
 ACLStrategised<HttpHeader*> ACLHTTPRepHeader::RegistryEntry_(new ACLHTTPHeaderData, ACLHTTPRepHeaderStrategy::Instance(), "rep_header");
diff --git a/src/ACLHTTPReqHeader.cc b/src/ACLHTTPReqHeader.cc
index c71421a44b..aeef79d626 100644
--- a/src/ACLHTTPReqHeader.cc
+++ b/src/ACLHTTPReqHeader.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLHTTPReqHeader.cc,v 1.1 2006/06/14 19:18:24 serassio Exp $
+ * $Id: ACLHTTPReqHeader.cc,v 1.1.6.1 2008/02/10 10:07:53 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -39,12 +39,6 @@
 #include "ACLChecklist.h"
 #include "HttpRequest.h"
 
-/* explicit template instantiation required for some systems */
-
-template class ACLStrategised<HttpHeader*>
-
-;
-
 ACL::Prototype ACLHTTPReqHeader::RegistryProtoype(&ACLHTTPReqHeader::RegistryEntry_, "req_header");
 
 ACLStrategised<HttpHeader*> ACLHTTPReqHeader::RegistryEntry_(new ACLHTTPHeaderData, ACLHTTPReqHeaderStrategy::Instance(), "req_header");
diff --git a/src/ACLStrategised.cc b/src/ACLStrategised.cc
index ec7e2dbe27..126dd7364a 100644
--- a/src/ACLStrategised.cc
+++ b/src/ACLStrategised.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLStrategised.cc,v 1.1 2003/02/17 07:01:34 robertc Exp $
+ * $Id: ACLStrategised.cc,v 1.1.6.1 2008/02/10 10:07:53 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -41,3 +41,14 @@
 #include "ACLRegexData.h"
 #include "ACLDomainData.h"
 
+/* 
+ *  moved template instantiation into ACLStrategized.cc from
+ *  ACLHTTPRepHeader.cc and ACLHTTPReqHeader.cc to compile on
+ *  Mac OSX 10.5 Leopard, this corrects a duplicate symbol error
+ */
+ 
+/* explicit template instantiation required for some systems */
+
+template class ACLStrategised<HttpHeader*>
+
+;
diff --git a/src/cf.data.pre b/src/cf.data.pre
index f6c778efe0..165c2dd439 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.488.4.1 2008/01/20 18:39:39 serassio Exp $
+# $Id: cf.data.pre,v 1.488.4.2 2008/02/10 10:07:53 serassio Exp $
 #
 # SQUID Web Proxy Cache		http://www.squid-cache.org/
 # ----------------------------------------------------------
@@ -2451,19 +2451,14 @@ TYPE: acl_access
 DEFAULT: none
 LOC: Config.accessList.noCache
 DOC_START
-	A list of ACL elements which, if matched, cause the request to
+	A list of ACL elements which, if matched and denied, cause the request to
 	not be satisfied from the cache and the reply to not be cached.
 	In other words, use this to force certain objects to never be cached.
 
-	You must use the word 'DENY' to indicate the ACL names which should
-	NOT be cached.
+	You must use the words 'allow' or 'deny' to indicate whether items
+	matching the ACL should be allowed or denied into the cache.
 
 	Default is to allow all to be cached
-NOCOMMENT_START
-#We recommend you to use the following two lines.
-acl QUERY urlpath_regex cgi-bin \?
-cache deny QUERY
-NOCOMMENT_END
 DOC_END
 
 NAME: refresh_pattern
@@ -2564,6 +2559,7 @@ Suggested default:
 NOCOMMENT_START
 refresh_pattern ^ftp:		1440	20%	10080
 refresh_pattern ^gopher:	1440	0%	1440
+refresh_pattern (cgi-bin|\?)	0	0%	0
 refresh_pattern .		0	20%	4320
 NOCOMMENT_END
 DOC_END