This document contains the release notes for version 3.0 of Squid.
Squid is a WWW Cache application developed by the National Laboratory
@@ -15,7 +15,7 @@
-The Squid Team are pleased to announce the release of Squid-3.0.STABLE2.
+The Squid Team are pleased to announce the release of Squid-3.0.STABLE3.
This new release is available for download from
http://www.squid-cache.org/Versions/v3/3.0/ or the
mirrors.
@@ -688,6 +688,11 @@
url_rewrite_program
No urlgroup support in either requests or responese
+
+auth_param
+fake_auth helper for NTLM now accepts the '-S' parameter to strip NTLM domain off the username string.
+This is useful for class 4 Delay Pools in Squid 3.x
+
diff -u -r squid-3.0.STABLE2/src/access_log.cc squid-3.0.STABLE3/src/access_log.cc
--- squid-3.0.STABLE2/src/access_log.cc 2007-08-14 06:25:14.000000000 +1200
+++ squid-3.0.STABLE3/src/access_log.cc 2008-03-31 18:20:26.000000000 +1200
@@ -587,8 +587,9 @@
break;
case LFT_TIME_SECONDS_SINCE_EPOCH:
- outint = current_time.tv_sec;
- doint = 1;
+ // some platforms store time in 32-bit, some 64-bit...
+ outoff = static_cast(current_time.tv_sec);
+ dooff = 1;
break;
case LFT_TIME_SUBSECOND:
@@ -795,16 +796,16 @@
break;
case LFT_REPLY_HIGHOFFSET:
- outint = static_cast(al->cache.highOffset);
+ outoff = al->cache.highOffset;
- doint = 1;
+ dooff = 1;
break;
case LFT_REPLY_OBJECTSIZE:
- outint = static_cast(al->cache.objectSize);
+ outoff = al->cache.objectSize;
- doint = 1;
+ dooff = 1;
break;
diff -u -r squid-3.0.STABLE2/src/ACLBrowser.cc squid-3.0.STABLE3/src/ACLBrowser.cc
--- squid-3.0.STABLE2/src/ACLBrowser.cc 2004-12-21 05:30:32.000000000 +1300
+++ squid-3.0.STABLE3/src/ACLBrowser.cc 2008-03-31 18:20:25.000000000 +1200
@@ -41,11 +41,7 @@
/* explicit template instantiation required for some systems */
-template class ACLStrategised
-
-;
template class ACLRequestHeaderStrategy
-
;
ACL::Prototype ACLBrowser::RegistryProtoype(&ACLBrowser::RegistryEntry_, "browser");
diff -u -r squid-3.0.STABLE2/src/ACLMyPortName.cc squid-3.0.STABLE3/src/ACLMyPortName.cc
--- squid-3.0.STABLE2/src/ACLMyPortName.cc 2008-02-27 23:06:42.000000000 +1300
+++ squid-3.0.STABLE3/src/ACLMyPortName.cc 2008-03-31 18:20:25.000000000 +1200
@@ -1,6 +1,6 @@
/*
- * $Id: ACLMyPortName.cc,v 1.2.2.1 2008/02/27 10:06:42 amosjeffries Exp $
+ * $Id: ACLMyPortName.cc,v 1.2 2008/02/11 22:44:50 rousskov Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
@@ -40,8 +40,6 @@
/* explicit template instantiation required for some systems */
-template class ACLStrategised;
-
ACL::Prototype ACLMyPortName::RegistryProtoype(&ACLMyPortName::RegistryEntry_, "myportname");
ACLStrategised ACLMyPortName::RegistryEntry_(new ACLStringData, ACLMyPortNameStrategy::Instance(), "myportname");
diff -u -r squid-3.0.STABLE2/src/ACLStrategised.cc squid-3.0.STABLE3/src/ACLStrategised.cc
--- squid-3.0.STABLE2/src/ACLStrategised.cc 2008-02-06 17:06:46.000000000 +1300
+++ squid-3.0.STABLE3/src/ACLStrategised.cc 2008-03-31 18:20:25.000000000 +1200
@@ -1,5 +1,5 @@
/*
- * $Id: ACLStrategised.cc,v 1.1.4.1 2008/02/06 04:06:46 amosjeffries Exp $
+ * $Id: ACLStrategised.cc,v 1.2 2008/02/06 04:05:38 amosjeffries Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
@@ -43,12 +43,13 @@
/*
* moved template instantiation into ACLStrategized.cc from
- * ACLHTTPRepHeader.cc and ACLHTTPReqHeader.cc to compile on
+ * ACLHTTPRepHeader.cc, ACLHTTPReqHeader.cc, ACLBrowser.cc,
+ * and ACLMyPortName.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
+template class ACLStrategised;
-;
+template class ACLStrategised;
diff -u -r squid-3.0.STABLE2/src/auth/Makefile.in squid-3.0.STABLE3/src/auth/Makefile.in
--- squid-3.0.STABLE2/src/auth/Makefile.in 2008-03-05 01:31:33.000000000 +1300
+++ squid-3.0.STABLE3/src/auth/Makefile.in 2008-03-31 18:20:26.000000000 +1200
@@ -312,7 +312,7 @@
# Makefile for authentication modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.93.2.1 2008/03/04 12:31:33 amosjeffries Exp $
+# $Id: Makefile.am,v 1.6 2005/10/23 11:55:38 hno Exp $
#
AUTOMAKE_OPTIONS = subdir-objects
AM_CFLAGS = @SQUID_CFLAGS@
diff -u -r squid-3.0.STABLE2/src/client_side_reply.cc squid-3.0.STABLE3/src/client_side_reply.cc
--- squid-3.0.STABLE2/src/client_side_reply.cc 2008-02-27 18:59:29.000000000 +1300
+++ squid-3.0.STABLE3/src/client_side_reply.cc 2008-03-31 18:20:27.000000000 +1200
@@ -1214,7 +1214,7 @@
if (is_hit)
hdr->delById(HDR_SET_COOKIE);
- reply->header.removeHopByHopEntries();
+ reply->header.removeConnectionHeaderEntries();
// if (request->range)
// clientBuildRangeHeader(http, reply);
diff -u -r squid-3.0.STABLE2/src/dns_internal.cc squid-3.0.STABLE3/src/dns_internal.cc
--- squid-3.0.STABLE2/src/dns_internal.cc 2008-02-10 23:43:09.000000000 +1300
+++ squid-3.0.STABLE3/src/dns_internal.cc 2008-03-31 18:20:27.000000000 +1200
@@ -768,29 +768,26 @@
assert(q->lru.prev == NULL);
-try_again:
- ns = q->nsends % nns;
+ do {
+ ns = q->nsends % nns;
- if (q->need_vc) {
- idnsSendQueryVC(q, ns);
- x = 0;
- } else
- x = comm_udp_sendto(DnsSocket,
- &nameservers[ns].S,
- sizeof(nameservers[ns].S),
- q->buf,
- q->sz);
-
- q->nsends++;
+ if (q->need_vc) {
+ idnsSendQueryVC(q, ns);
+ x = 0;
+ } else {
+ x = comm_udp_sendto(DnsSocket, nameservers[ns].S, sizeof(nameservers[ns].S), q->buf, q->sz);
+ }
- q->sent_t = current_time;
+ q->nsends++;
- if (x < 0) {
- debugs(50, 1, "idnsSendQuery: FD " << DnsSocket << ": sendto: " << xstrerror());
+ q->sent_t = current_time;
- if (q->nsends % nns != 0)
- goto try_again;
- } else {
+ if (x < 0)
+ debugs(50, 1, "idnsSendQuery: FD " << DnsSocket << ": sendto: " << xstrerror());
+
+ } while( x<0 && q->nsends % nns != 0);
+
+ if(x >= 0) {
fd_bytes(DnsSocket, x, FD_WRITE);
commSetSelect(DnsSocket, COMM_SELECT_READ, idnsRead, NULL, 0);
}
diff -u -r squid-3.0.STABLE2/src/fs/Makefile.in squid-3.0.STABLE3/src/fs/Makefile.in
--- squid-3.0.STABLE2/src/fs/Makefile.in 2008-03-05 01:31:33.000000000 +1300
+++ squid-3.0.STABLE3/src/fs/Makefile.in 2008-03-31 18:20:27.000000000 +1200
@@ -16,7 +16,7 @@
# Makefile for storage modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.98.2.1 2008/03/04 12:31:33 amosjeffries Exp $
+# $Id: Makefile.am,v 1.13 2005/08/20 21:08:38 serassio Exp $
#
srcdir = @srcdir@
diff -u -r squid-3.0.STABLE2/src/HttpHdrCc.cc squid-3.0.STABLE3/src/HttpHdrCc.cc
--- squid-3.0.STABLE2/src/HttpHdrCc.cc 2007-05-30 01:31:37.000000000 +1200
+++ squid-3.0.STABLE3/src/HttpHdrCc.cc 2008-03-31 18:20:26.000000000 +1200
@@ -246,7 +246,7 @@
if (flag == CC_S_MAXAGE)
packerPrintf(p, "=%d", (int) cc->s_maxage);
- if (flag == CC_MAX_STALE)
+ if (flag == CC_MAX_STALE && cc->max_stale >= 0)
packerPrintf(p, "=%d", (int) cc->max_stale);
pcount++;
diff -u -r squid-3.0.STABLE2/src/HttpHdrRange.cc squid-3.0.STABLE3/src/HttpHdrRange.cc
--- squid-3.0.STABLE2/src/HttpHdrRange.cc 2007-08-14 05:20:51.000000000 +1200
+++ squid-3.0.STABLE3/src/HttpHdrRange.cc 2008-03-31 18:20:26.000000000 +1200
@@ -538,8 +538,12 @@
/* not a range request */
return false;
+ if (Config.rangeOffsetLimit == 0)
+ /* disabled */
+ return true;
+
if (-1 == Config.rangeOffsetLimit)
- /* disabled */
+ /* forced */
return false;
if (firstOffset() == -1)
diff -u -r squid-3.0.STABLE2/src/HttpHeader.cc squid-3.0.STABLE3/src/HttpHeader.cc
--- squid-3.0.STABLE2/src/HttpHeader.cc 2008-02-27 18:59:29.000000000 +1300
+++ squid-3.0.STABLE3/src/HttpHeader.cc 2008-03-31 18:20:26.000000000 +1200
@@ -1806,5 +1806,7 @@
}
if (headers_deleted)
refreshMask();
+
+ delById(HDR_CONNECTION);
}
}
diff -u -r squid-3.0.STABLE2/src/HttpHeader.h squid-3.0.STABLE3/src/HttpHeader.h
--- squid-3.0.STABLE2/src/HttpHeader.h 2008-02-27 18:59:29.000000000 +1300
+++ squid-3.0.STABLE3/src/HttpHeader.h 2008-03-31 18:20:26.000000000 +1200
@@ -247,15 +247,13 @@
int hasListMember(http_hdr_type id, const char *member, const char separator) const;
int hasByNameListMember(const char *name, const char *member, const char separator) const;
void removeHopByHopEntries();
+ void removeConnectionHeaderEntries();
/* protected, do not use these, use interface functions instead */
Vector entries; /* parsed fields in raw format */
HttpHeaderMask mask; /* bit set <=> entry present */
http_hdr_owner_type owner; /* request or reply */
int len; /* length when packed, not counting terminating '\0' */
-protected:
- void removeConnectionHeaderEntries();
-
private:
HttpHeaderEntry *findLastEntry(http_hdr_type id) const;
// Make it non-copyable. Our destructor is a bit nasty...
diff -u -r squid-3.0.STABLE2/src/HttpHeaderTools.cc squid-3.0.STABLE3/src/HttpHeaderTools.cc
--- squid-3.0.STABLE2/src/HttpHeaderTools.cc 2007-09-28 12:22:37.000000000 +1200
+++ squid-3.0.STABLE3/src/HttpHeaderTools.cc 2008-03-31 18:20:26.000000000 +1200
@@ -269,6 +269,9 @@
/* skip leading ws (ltrim) */
*pos += xcountws(*pos);
+ /* skip leading delimiters */
+ *pos += strspn(*pos, delim[0]);
+
*item = *pos; /* remember item's start */
/* find next delimiter */
diff -u -r squid-3.0.STABLE2/src/Makefile.in squid-3.0.STABLE3/src/Makefile.in
--- squid-3.0.STABLE2/src/Makefile.in 2008-03-05 01:31:33.000000000 +1300
+++ squid-3.0.STABLE3/src/Makefile.in 2008-03-31 18:20:26.000000000 +1200
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.447.2.2 2008/03/04 12:31:33 amosjeffries Exp $
+# $Id: Makefile.am,v 1.193.2.1 2008/02/27 05:51:04 amosjeffries Exp $
#
# Uncomment and customize the following to suit your needs:
#
diff -u -r squid-3.0.STABLE2/src/repl/Makefile.in squid-3.0.STABLE3/src/repl/Makefile.in
--- squid-3.0.STABLE2/src/repl/Makefile.in 2008-03-05 01:31:34.000000000 +1300
+++ squid-3.0.STABLE3/src/repl/Makefile.in 2008-03-31 18:20:28.000000000 +1200
@@ -16,7 +16,7 @@
# Makefile for storage modules in the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.92.2.1 2008/03/04 12:31:34 amosjeffries Exp $
+# $Id: Makefile.am,v 1.7 2005/08/20 21:08:38 serassio Exp $
#
srcdir = @srcdir@
diff -u -r squid-3.0.STABLE2/test-suite/Makefile.in squid-3.0.STABLE3/test-suite/Makefile.in
--- squid-3.0.STABLE2/test-suite/Makefile.in 2008-03-05 01:31:35.000000000 +1300
+++ squid-3.0.STABLE3/test-suite/Makefile.in 2008-03-31 18:20:28.000000000 +1200
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.89.2.1 2008/03/04 12:31:35 amosjeffries Exp $
+# $Id: Makefile.am,v 1.20 2007/01/04 20:52:57 hno Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
diff -u -r squid-3.0.STABLE2/TODO squid-3.0.STABLE3/TODO
--- squid-3.0.STABLE2/TODO 2005-03-11 10:49:19.000000000 +1300
+++ squid-3.0.STABLE3/TODO 2008-03-31 18:20:18.000000000 +1200
@@ -3,7 +3,6 @@
Feature freeze:
- overlapping helper feature implementation (plain or stateful or both).
- - Someone other than Robert to review the draft squid 3 release notes (in CVS already).
Other?
@@ -23,6 +22,7 @@
- Authentication tidyups in proxy_auth acl managagement (Done).
- Appropriate parts of rproxy (Done).
- Some kind of Range support to at least the level of 2.5 and earlier (Done).
+ - Someone other than Robert to review the draft squid 3 release notes (in CVS already).
Squid-3.1
diff -u -r squid-3.0.STABLE2/tools/Makefile.in squid-3.0.STABLE3/tools/Makefile.in
--- squid-3.0.STABLE2/tools/Makefile.in 2008-03-05 01:31:35.000000000 +1300
+++ squid-3.0.STABLE3/tools/Makefile.in 2008-03-31 18:20:28.000000000 +1200
@@ -17,7 +17,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.28.2.1 2008/03/04 12:31:35 amosjeffries Exp $
+# $Id: Makefile.am,v 1.2 2006/05/11 12:25:39 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#