The Squid Team are pleased to announce the release of Squid-3.0.STABLE7.
+The Squid Team are pleased to announce the release of Squid-3.0.STABLE8.
This new release is available for download from http://www.squid-cache.org/Versions/v3/3.0/ or the mirrors.
@@ -505,10 +505,6 @@Removed options:
- userhash, not yet ported to Squid-3
-
- sourcehash, not yet ported to Squid-2
-
monitorurl, monitorsize etc, not yet ported to Squid-3
connection-auth=, not yet ported to Squid-3
@@ -520,7 +516,7 @@
no-store, replaces the older read-only option
- min-size, not yet portedto Squid-3
+ min-size, not yet ported to Squid-3
@@ -597,7 +593,9 @@
+
The 'all' ACL is now provided as a built-in. Warnings will be displayed if any attempt is made to redefine it.
New types:
acl aclname http_status 200 301 500- 400-403 ... # status code in reply
@@ -615,6 +613,7 @@
+
New default:
@@ -679,15 +678,6 @@-
Removed format tags: -
- >st Request size including HTTP headers, not yet ported to Squid-3. - - st Request+Reply size including HTTP headers, not yet ported to Squid-3. - -- -
Syntax changed:
diff -u -r -N squid-3.0.STABLE7/src/access_log.cc squid-3.0.STABLE8/src/access_log.cc
--- squid-3.0.STABLE7/src/access_log.cc 2008-06-22 15:35:52.000000000 +1200
+++ squid-3.0.STABLE8/src/access_log.cc 2008-07-18 22:02:53.000000000 +1200
@@ -368,7 +368,7 @@
/*LFT_REQUEST_QUERY, * // * this is not needed. see strip_query_terms */
LFT_REQUEST_VERSION,
- /*LFT_REQUEST_SIZE_TOTAL, */
+ LFT_REQUEST_SIZE_TOTAL,
/*LFT_REQUEST_SIZE_LINE, */
/*LFT_REQUEST_SIZE_HEADERS, */
/*LFT_REQUEST_SIZE_BODY, */
@@ -383,6 +383,7 @@
/*LFT_REPLY_SIZE_BODY_NO_TE, */
LFT_TAG,
+ LFT_IO_SIZE_TOTAL,
LFT_EXT_LOG,
LFT_PERCENT /* special string cases for escaped chars */
@@ -488,7 +489,7 @@
{">v", LFT_REQUEST_VERSION},
{"rv", LFT_REQUEST_VERSION},
- /*{ ">st", LFT_REQUEST_SIZE_TOTAL }, */
+ { ">st", LFT_REQUEST_SIZE_TOTAL },
/*{ ">sl", LFT_REQUEST_SIZE_LINE }, * / / * the request line "GET ... " */
/*{ ">sh", LFT_REQUEST_SIZE_HEADERS }, */
/*{ ">sb", LFT_REQUEST_SIZE_BODY }, */
@@ -503,6 +504,7 @@
/*{ "http.version.major, (int) al->http.version.minor);
-
out = tmp;
+ break;
+ case LFT_REQUEST_SIZE_TOTAL:
+ outint = al->cache.requestSize;
+ dooff = 1;
break;
- /*case LFT_REQUEST_SIZE_TOTAL: */
/*case LFT_REQUEST_SIZE_LINE: */
/*case LFT_REQUEST_SIZE_HEADERS: */
/*case LFT_REQUEST_SIZE_BODY: */
/*case LFT_REQUEST_SIZE_BODY_NO_TE: */
case LFT_REPLY_SIZE_TOTAL:
- outoff = al->cache.size;
-
+ outoff = al->cache.replySize;
dooff = 1;
-
break;
case LFT_REPLY_HIGHOFFSET:
@@ -822,6 +824,11 @@
break;
+ case LFT_IO_SIZE_TOTAL:
+ outint = al->cache.requestSize + al->cache.replySize;
+ doint = 1;
+ break;
+
case LFT_EXT_LOG:
if (al->request)
out = al->request->extacl_log.buf();
@@ -1303,7 +1310,7 @@
client,
log_tags[al->cache.code],
al->http.code,
- al->cache.size,
+ al->cache.replySize,
al->_private.method_str,
al->url,
user ? user : dash_str,
@@ -1321,7 +1328,7 @@
client,
log_tags[al->cache.code],
al->http.code,
- al->cache.size,
+ al->cache.replySize,
al->_private.method_str,
al->url,
user ? user : dash_str,
@@ -1362,7 +1369,7 @@
al->url,
al->http.version.major, al->http.version.minor,
al->http.code,
- al->cache.size,
+ al->cache.replySize,
log_tags[al->cache.code],
hier_strings[al->hier.code]);
diff -u -r -N squid-3.0.STABLE7/src/AccessLogEntry.h squid-3.0.STABLE8/src/AccessLogEntry.h
--- squid-3.0.STABLE7/src/AccessLogEntry.h 2008-06-22 15:35:51.000000000 +1200
+++ squid-3.0.STABLE8/src/AccessLogEntry.h 2008-07-18 22:02:52.000000000 +1200
@@ -79,7 +79,9 @@
{
public:
- CacheDetails() : size(0),
+ CacheDetails() :
+ requestSize(0),
+ replySize(0),
highOffset(0),
objectSize(0),
code (LOG_TAG_NONE),
@@ -95,7 +97,8 @@
}
struct IN_ADDR caddr;
- int64_t size;
+ int64_t requestSize;
+ int64_t replySize;
int64_t highOffset;
int64_t objectSize;
log_type code;
diff -u -r -N squid-3.0.STABLE7/src/cache_cf.cc squid-3.0.STABLE8/src/cache_cf.cc
--- squid-3.0.STABLE7/src/cache_cf.cc 2008-06-22 15:35:52.000000000 +1200
+++ squid-3.0.STABLE8/src/cache_cf.cc 2008-07-18 22:02:53.000000000 +1200
@@ -1723,6 +1723,18 @@
p->options.carp = 1;
#endif
+ } else if (!strcasecmp(token, "userhash")) {
+ if (p->type != PEER_PARENT)
+ fatalf("parse_peer: non-parent userhash peer %s/%d\n", p->host, p->http_port);
+
+ p->options.userhash = 1;
+
+ } else if (!strcasecmp(token, "sourcehash")) {
+ if (p->type != PEER_PARENT)
+ fatalf("parse_peer: non-parent sourcehash peer %s/%d\n", p->host, p->http_port);
+
+ p->options.sourcehash = 1;
+
#if DELAY_POOLS
} else if (!strcasecmp(token, "no-delay")) {
@@ -1831,8 +1843,7 @@
*head = p;
Config.npeers++;
-
- peerClearRR(p);
+ peerClearRRStart();
}
static void
diff -u -r -N squid-3.0.STABLE7/src/cf.data.pre squid-3.0.STABLE8/src/cf.data.pre
--- squid-3.0.STABLE7/src/cf.data.pre 2008-06-22 15:35:53.000000000 +1200
+++ squid-3.0.STABLE8/src/cf.data.pre 2008-07-18 22:02:53.000000000 +1200
@@ -455,12 +455,14 @@
DOC_START
Defining an Access List
- acl aclname acltype string1 ...
- acl aclname acltype "file" ...
+ Every access list definition must begin with an aclname and acltype,
+ followed by either type-specific arguments or a quoted filename that
+ they are read from.
- when using "file", the file should contain one item per line
+ acl aclname acltype argument ...
+ acl aclname acltype "file" ...
- acltype is one of the types described below
+ When using "file", the file should contain one item per line.
By default, regular expressions are CASE-SENSITIVE. To make
them case-insensitive, use the -i option.
@@ -468,10 +470,10 @@
***** ACL TYPES AVAILABLE *****
- acl aclname src ip-address/netmask ... (clients IP address)
- acl aclname src addr1-addr2/netmask ... (range of addresses)
- acl aclname dst ip-address/netmask ... (URL host's IP address)
- acl aclname myip ip-address/netmask ... (local socket IP address)
+ acl aclname src ip-address/netmask ... # clients IP address
+ acl aclname src addr1-addr2/netmask ... # range of addresses
+ acl aclname dst ip-address/netmask ... # URL host's IP address
+ acl aclname myip ip-address/netmask ... # local socket IP address
acl aclname arp mac-address ... (xx:xx:xx:xx:xx:xx notation)
# The arp ACL requires the special configure option --enable-arp-acl.
@@ -482,16 +484,16 @@
# the same subnet. If the client is on a different subnet, then Squid cannot
# find out its MAC address.
- acl aclname srcdomain .foo.com ... # reverse lookup, from client IP
- acl aclname dstdomain .foo.com ... # Destination server from URL
- acl aclname srcdom_regex [-i] xxx ... # regex matching client name
- acl aclname dstdom_regex [-i] xxx ... # regex matching server
+ acl aclname srcdomain .foo.com ... # reverse lookup, from client IP
+ acl aclname dstdomain .foo.com ... # Destination server from URL
+ acl aclname srcdom_regex [-i] \.foo\.com ... # regex matching client name
+ acl aclname dstdom_regex [-i] \.foo\.com ... # regex matching server
# For dstdomain and dstdom_regex a reverse lookup is tried if a IP
# based URL is used and no match is found. The name "none" is used
# if the reverse lookup fails.
- acl aclname src_as number ...
- acl aclname dst_as number ...
+ acl aclname src_as number ...
+ acl aclname dst_as number ...
# Except for access control, AS numbers can be used for
# routing of requests to specific caches. Here's an
# example for routing all requests for AS#1241 and only
@@ -500,39 +502,39 @@
# cache_peer_access mycache.mydomain.net allow asexample
# cache_peer_access mycache_mydomain.net deny all
- acl aclname time [day-abbrevs] [h1:m1-h2:m2]
- day-abbrevs:
- S - Sunday
- M - Monday
- T - Tuesday
- W - Wednesday
- H - Thursday
- F - Friday
- A - Saturday
- h1:m1 must be less than h2:m2
+ acl aclname time [day-abbrevs] [h1:m1-h2:m2]
+ # day-abbrevs:
+ # S - Sunday
+ # M - Monday
+ # T - Tuesday
+ # W - Wednesday
+ # H - Thursday
+ # F - Friday
+ # A - Saturday
+ # h1:m1 must be less than h2:m2
- acl aclname url_regex [-i] ^http:// ... # regex matching on whole URL
+ acl aclname url_regex [-i] ^http:// ... # regex matching on whole URL
acl aclname urlpath_regex [-i] \.gif$ ... # regex matching on URL path
- acl aclname port 80 70 21 ...
- acl aclname port 0-1024 ... # ranges allowed
- acl aclname myport 3128 ... # (local socket TCP port)
+ acl aclname port 80 70 21 ...
+ acl aclname port 0-1024 ... # ranges allowed
+ acl aclname myport 3128 ... # (local socket TCP port)
acl aclname myportname 3128 ... # http(s)_port name
- acl aclname proto HTTP FTP ...
+ acl aclname proto HTTP FTP ...
- acl aclname method GET POST ...
+ acl aclname method GET POST ...
acl aclname http_status 200 301 500- 400-403 ... # status code in reply
- acl aclname browser [-i] regexp ...
+ acl aclname browser [-i] regexp ...
# pattern match on User-Agent header (see also req_header below)
- acl aclname referer_regex [-i] regexp ...
+ acl aclname referer_regex [-i] regexp ...
# pattern match on Referer header
# Referer is highly unreliable, so use with care
- acl aclname ident username ...
+ acl aclname ident username ...
acl aclname ident_regex [-i] pattern ...
# string match on ident output.
# use REQUIRED to accept any non-null ident.
@@ -577,7 +579,7 @@
# clients may appear to come from multiple addresses if they are
# going through proxy farms, so a limit of 1 may cause user problems.
- acl aclname req_mime_type [-i] mime-type1 ...
+ acl aclname req_mime_type [-i] mime-type ...
# regex match against the mime type of the request generated
# by the client. Can be used to detect file upload or some
# types HTTP tunneling requests.
@@ -589,7 +591,7 @@
# thought of as a superset of "browser", "referer" and "mime-type"
# ACLs.
- acl aclname rep_mime_type [-i] mime-type1 ...
+ acl aclname rep_mime_type [-i] mime-type ...
# regex match against the mime type of the reply received by
# squid. Can be used to detect file download or some
# types HTTP tunneling requests.
@@ -602,7 +604,7 @@
# thought of as a superset of "browser", "referer" and "mime-type"
# ACLs.
- acl acl_name external class_name [arguments...]
+ acl aclname external class_name [arguments...]
# external ACL lookup via a helper class defined by the
# external_acl_type directive.
@@ -1309,6 +1311,8 @@
round-robin
weighted-round-robin
carp
+ userhash
+ sourcehash
multicast-responder
closest-only
no-digest
@@ -1383,6 +1387,12 @@
distributed among the parents based on the CARP load
balancing hash function based on their weight.
+ use 'userhash' to load-balance amongst a set of parents
+ based on the client proxy_auth or ident username.
+
+ use 'sourcehash' to load-balance amongst a set of parents
+ based on the client source ip.
+
'multicast-responder' indicates the named peer
is a member of a multicast group. ICP queries will
not be sent directly to the peer, but ICP replies
@@ -2006,6 +2016,8 @@
et Tag returned by external acl
ea Log string returned by external acl
st Request size including HTTP headers
+ st Request+Reply size including HTTP headers
http.method = request->method;
aLogEntry->http.version = request->http_ver;
aLogEntry->hier = request->hier;
-
+ aLogEntry->cache.requestSize += request->content_length;
aLogEntry->cache.extuser = request->extacl_user.buf();
if (request->auth_user_request) {
@@ -495,7 +495,9 @@
al.cache.caddr = getConn() != NULL ? getConn()->log_addr : no_addr;
- al.cache.size = out.size;
+ al.cache.requestSize = req_sz;
+
+ al.cache.replySize = out.size;
al.cache.highOffset = out.offset;
diff -u -r -N squid-3.0.STABLE7/src/comm.cc squid-3.0.STABLE8/src/comm.cc
--- squid-3.0.STABLE7/src/comm.cc 2008-06-22 15:35:53.000000000 +1200
+++ squid-3.0.STABLE8/src/comm.cc 2008-07-18 22:02:54.000000000 +1200
@@ -2220,7 +2220,7 @@
void CommIO::Initialise() {
/* Initialize done pipe signal */
int DonePipe[2];
- pipe(DonePipe);
+ if(pipe(DonePipe)) {}
DoneFD = DonePipe[1];
DoneReadFD = DonePipe[0];
fd_open(DoneReadFD, FD_PIPE, "async-io completetion event: main");
diff -u -r -N squid-3.0.STABLE7/src/dns_internal.cc squid-3.0.STABLE8/src/dns_internal.cc
--- squid-3.0.STABLE7/src/dns_internal.cc 2008-06-22 15:35:53.000000000 +1200
+++ squid-3.0.STABLE8/src/dns_internal.cc 2008-07-18 22:02:54.000000000 +1200
@@ -388,7 +388,7 @@
t = (char *) xmalloc(Size);
RegQueryValueEx(hndKey, "Domain", NULL, &Type, (LPBYTE) t,
&Size);
- debugs(78, 1, "Adding domain " << token << " from Registry");
+ debugs(78, 1, "Adding domain " << t << " from Registry");
idnsAddPathComponent(t);
xfree(t);
}
@@ -412,7 +412,7 @@
RegCloseKey(hndKey);
}
- if (npc == 0 && ((const char *) t = getMyHostname())) {
+ if (npc == 0 && (t = (char *) getMyHostname())) {
t = strchr(t, '.');
if (t)
idnsAddPathComponent(t + 1);
@@ -443,7 +443,7 @@
if (Result == ERROR_SUCCESS && Size) {
t = (char *) xmalloc(Size);
- RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, t,
+ RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, (LPBYTE) t,
&Size);
token = strtok(t, ", ");
@@ -460,7 +460,7 @@
if (Result == ERROR_SUCCESS && Size) {
t = (char *) xmalloc(Size);
- RegQueryValueEx(hndKey, "NameServer", NULL, &Type, t, &Size);
+ RegQueryValueEx(hndKey, "NameServer", NULL, &Type, (LPBYTE) t, &Size);
token = strtok(t, ", ");
while (token) {
@@ -514,7 +514,7 @@
if (Result == ERROR_SUCCESS && Size) {
t = (char *) xmalloc(Size);
RegQueryValueEx(hndKey2, "DhcpNameServer", NULL,
- &Type, t, &Size);
+ &Type, (LPBYTE) t, &Size);
token = strtok(t, ", ");
while (token) {
@@ -532,7 +532,7 @@
if (Result == ERROR_SUCCESS && Size) {
t = (char *) xmalloc(Size);
RegQueryValueEx(hndKey2, "NameServer", NULL, &Type,
- t, &Size);
+ (LPBYTE) t, &Size);
token = strtok(t, ", ");
while (token) {
@@ -573,7 +573,7 @@
if (Result == ERROR_SUCCESS && Size) {
t = (char *) xmalloc(Size);
- RegQueryValueEx(hndKey, "NameServer", NULL, &Type, t, &Size);
+ RegQueryValueEx(hndKey, "NameServer", NULL, &Type, (LPBYTE) t, &Size);
token = strtok(t, ", ");
while (token) {
diff -u -r -N squid-3.0.STABLE7/src/dnsserver.cc squid-3.0.STABLE8/src/dnsserver.cc
--- squid-3.0.STABLE7/src/dnsserver.cc 2008-06-22 15:35:53.000000000 +1200
+++ squid-3.0.STABLE8/src/dnsserver.cc 2008-07-18 22:02:54.000000000 +1200
@@ -399,8 +399,12 @@
for (;;) {
memset(request, '\0', REQ_SZ);
- if (fgets(request, REQ_SZ, stdin) == NULL)
- exit(1);
+ if (fgets(request, REQ_SZ, stdin) == NULL) {
+#ifdef _SQUID_MSWIN_
+ WSACleanup();
+#endif
+ exit(1);
+ }
t = strrchr(request, '\n');
diff -u -r -N squid-3.0.STABLE7/src/enums.h squid-3.0.STABLE8/src/enums.h
--- squid-3.0.STABLE7/src/enums.h 2008-06-22 15:35:53.000000000 +1200
+++ squid-3.0.STABLE8/src/enums.h 2008-07-18 22:02:54.000000000 +1200
@@ -176,6 +176,8 @@
CARP,
#endif
ANY_OLD_PARENT,
+ USERHASH_PARENT,
+ SOURCEHASH_PARENT,
HIER_MAX
} hier_code;
diff -u -r -N squid-3.0.STABLE7/src/errorpage.cc squid-3.0.STABLE8/src/errorpage.cc
--- squid-3.0.STABLE7/src/errorpage.cc 2008-06-22 15:35:53.000000000 +1200
+++ squid-3.0.STABLE8/src/errorpage.cc 2008-07-18 22:02:54.000000000 +1200
@@ -81,12 +81,12 @@
{
ERR_SQUID_SIGNATURE,
- "\n
\n"
- "
\n"
- "\n"
+ "\n
\n"
+ "
\n"
+ "\n"
+ "