diff -ruN squid-2.6.STABLE19/ChangeLog squid-2.6.STABLE20/ChangeLog
--- squid-2.6.STABLE19/ChangeLog 2008-03-18 01:57:20.000000000 +0100
+++ squid-2.6.STABLE20/ChangeLog 2008-04-25 21:49:06.000000000 +0200
@@ -1,3 +1,21 @@
+Changes to squid-2.6.STABLE20 (25 Apr 2008)
+
+ - Bug #2263: Custom log formats fail to log file sizes >2GB properly
+ on 32-bit platforms
+ - Fix stripping NT domain in squid_ldap_group
+ - Bug #2278: Cache-Control: max-stale=0 forwarded wrongly as max-stale
+ (without delta)
+ - Bug #2283: Fails to parse chunked encoding using chunk extensions
+ - Bug #420: Deal properly with empty list HTTP header members
+ - Windows Server 2008 support
+ - Bug #1886: tcp_outgoing_address acl doesn't work with indirect
+ source address (follow-x-forwarded-for)
+ - Bug #2296: Stuck in 100% CPU when fetching an corrupt peer digest
+ - Add support for the resolv.conf domain directive, and also
+ automatically derived default domain
+ - minimum_icp_query_timeout directive
+ - Bug #2329: Range header ignored on HIT
+
Changes to squid-2.6.STABLE19 (19 Mar 2008)
- Fix tcp_outgoing_address example config to match its description
diff -ruN squid-2.6.STABLE19/configure squid-2.6.STABLE20/configure
--- squid-2.6.STABLE19/configure 2008-03-18 02:05:57.000000000 +0100
+++ squid-2.6.STABLE20/configure 2008-04-25 21:49:52.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.in Revision: 1.416.2.25 .
+# From configure.in Revision: 1.416.2.26 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Squid Web Proxy 2.6.STABLE19.
+# Generated by GNU Autoconf 2.61 for Squid Web Proxy 2.6.STABLE20.
#
# Report bugs to .
#
@@ -575,8 +575,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='2.6.STABLE19'
-PACKAGE_STRING='Squid Web Proxy 2.6.STABLE19'
+PACKAGE_VERSION='2.6.STABLE20'
+PACKAGE_STRING='Squid Web Proxy 2.6.STABLE20'
PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
ac_default_prefix=/usr/local/squid
@@ -1314,7 +1314,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Squid Web Proxy 2.6.STABLE19 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 2.6.STABLE20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1384,7 +1384,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE19:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE20:";;
esac
cat <<\_ACEOF
@@ -1662,7 +1662,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 2.6.STABLE19
+Squid Web Proxy configure 2.6.STABLE20
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1676,7 +1676,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Squid Web Proxy $as_me 2.6.STABLE19, which was
+It was created by Squid Web Proxy $as_me 2.6.STABLE20, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2349,7 +2349,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='2.6.STABLE19'
+ VERSION='2.6.STABLE20'
cat >>confdefs.h <<_ACEOF
@@ -27276,7 +27276,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Squid Web Proxy $as_me 2.6.STABLE19, which was
+This file was extended by Squid Web Proxy $as_me 2.6.STABLE20, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -27329,7 +27329,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Squid Web Proxy config.status 2.6.STABLE19
+Squid Web Proxy config.status 2.6.STABLE20
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -ruN squid-2.6.STABLE19/configure.in squid-2.6.STABLE20/configure.in
--- squid-2.6.STABLE19/configure.in 2008-03-18 02:05:57.000000000 +0100
+++ squid-2.6.STABLE20/configure.in 2008-04-25 21:49:52.000000000 +0200
@@ -1,16 +1,16 @@
dnl
dnl Configuration input file for Squid
dnl
-dnl $Id: configure.in,v 1.416.2.25 2008/03/18 00:57:20 hno Exp $
+dnl $Id: configure.in,v 1.416.2.26 2008/04/22 15:17:28 hno Exp $
dnl
dnl
dnl
-AC_INIT(Squid Web Proxy, 2.6.STABLE19, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 2.6.STABLE20, http://www.squid-cache.org/bugs/, squid)
AC_PREREQ(2.52)
AM_CONFIG_HEADER(include/autoconf.h)
AC_CONFIG_AUX_DIR(cfgaux)
AM_INIT_AUTOMAKE
-AC_REVISION($Revision: 1.416.2.25 $)dnl
+AC_REVISION($Revision: 1.416.2.26 $)dnl
AC_PREFIX_DEFAULT(/usr/local/squid)
AM_MAINTAINER_MODE
diff -ruN squid-2.6.STABLE19/helpers/external_acl/ldap_group/squid_ldap_group.c squid-2.6.STABLE20/helpers/external_acl/ldap_group/squid_ldap_group.c
--- squid-2.6.STABLE19/helpers/external_acl/ldap_group/squid_ldap_group.c 2006-05-22 22:42:04.000000000 +0200
+++ squid-2.6.STABLE20/helpers/external_acl/ldap_group/squid_ldap_group.c 2008-03-18 03:59:15.000000000 +0100
@@ -465,9 +465,9 @@
}
rfc1738_unescape(user);
if (strip_nt_domain) {
- char *u = strchr(user, '\\');
+ char *u = strrchr(user, '\\');
if (!u)
- u = strchr(user, '/');
+ u = strrchr(user, '/');
if (u && u[1])
user = u + 1;
}
diff -ruN squid-2.6.STABLE19/include/version.h squid-2.6.STABLE20/include/version.h
--- squid-2.6.STABLE19/include/version.h 2008-03-18 02:05:57.000000000 +0100
+++ squid-2.6.STABLE20/include/version.h 2008-04-25 21:49:52.000000000 +0200
@@ -9,5 +9,5 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1205802352
+#define SQUID_RELEASE_TIME 1209152987
#endif
diff -ruN squid-2.6.STABLE19/lib/win32lib.c squid-2.6.STABLE20/lib/win32lib.c
--- squid-2.6.STABLE19/lib/win32lib.c 2007-06-03 02:40:31.000000000 +0200
+++ squid-2.6.STABLE20/lib/win32lib.c 2008-04-25 21:44:20.000000000 +0200
@@ -1,6 +1,6 @@
/*
- * $Id: win32lib.c,v 1.3.2.1 2007/06/03 00:40:31 hno Exp $
+ * $Id: win32lib.c,v 1.3.2.2 2008/04/25 19:44:20 hno Exp $
*
* Windows support
* AUTHOR: Guido Serassio
@@ -97,7 +97,13 @@
size_t
getpagesize()
{
- return 4096;
+ static DWORD system_pagesize = 0;
+ if (!system_pagesize) {
+ SYSTEM_INFO system_info;
+ GetSystemInfo(&system_info);
+ system_pagesize = system_info.dwPageSize;
+ }
+ return system_pagesize;
}
int64_t
@@ -247,7 +253,7 @@
* an in_addr structure. Returns 0 on failure,
* and 1 on success.
*/
-int
+int
inet_aton(const char *cp, struct in_addr *addr)
{
if (cp == NULL || addr == NULL) {
diff -ruN squid-2.6.STABLE19/RELEASENOTES.html squid-2.6.STABLE20/RELEASENOTES.html
--- squid-2.6.STABLE19/RELEASENOTES.html 2008-03-18 02:06:31.000000000 +0100
+++ squid-2.6.STABLE20/RELEASENOTES.html 2008-04-25 21:50:29.000000000 +0200
@@ -7,7 +7,7 @@
Squid 2.6.STABLE19 release notes
-Squid Developers
$Id: release-2.6.html,v 1.44.2.18 2008/03/18 00:57:21 hno Exp $
+Squid Developers
$Id: release-2.6.html,v 1.44.2.20 2008/04/25 19:49:06 hno Exp $
This document contains the release notes for version 2.6 of Squid.
Squid is a WWW Cache application developed by the Web Caching community.
@@ -84,6 +84,9 @@
+
+
+
@@ -799,5 +802,25 @@
+
+
+
+
+- Bug #2263: Custom log formats fail to log file sizes >2GB properly
+on 32-bit platforms
+- Bug #1886: tcp_outgoing_address acl doesn't work with indirect
+source address (follow-x-forwarded-for)
+- Bug #2296: Stuck in 100% CPU when fetching an corrupt peer digest
+- Add support for the resolv.conf domain directive, and also
+automatically derived default domain
+- minimum_icp_query_timeout directive
+- Bug #2329: Range header ignored on HIT
+- And some other trivial/cosmetic changes
+- See also the list of
+squid-2.6.STABLE20 changes and the
+ChangeLog file for details.
+
+
+