diff -ruN squid-2.6.STABLE11/ChangeLog squid-2.6.STABLE12/ChangeLog
--- squid-2.6.STABLE11/ChangeLog Fri Mar 16 17:48:38 2007
+++ squid-2.6.STABLE12/ChangeLog Tue Mar 20 15:34:20 2007
@@ -1,3 +1,7 @@
+Changes to squid-2.6.STABLE12 (Mar 20 2007)
+
+ - Assertion error on TRACE
+
Changes to squid-2.6.STABLE11 (Mar 17 2007)
- Bug #1915: assertion failed: client_side.c:4055: "buf != NULL ||
diff -ruN squid-2.6.STABLE11/RELEASENOTES.html squid-2.6.STABLE12/RELEASENOTES.html
--- squid-2.6.STABLE11/RELEASENOTES.html Fri Mar 16 17:52:07 2007
+++ squid-2.6.STABLE12/RELEASENOTES.html Tue Mar 20 15:36:18 2007
@@ -2,12 +2,12 @@
- Squid 2.6.STABLE11 release notes
+ Squid 2.6.STABLE12 release notes
-Squid 2.6.STABLE11 release notes
+Squid 2.6.STABLE12 release notes
-Squid Developers
$Id: release-2.6.html,v 1.44.2.5 2007/03/12 22:52:40 hno Exp $
+Squid Developers
$Id: release-2.6.html,v 1.44.2.6 2007/03/20 21:31:32 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.
@@ -60,6 +60,9 @@
+
+
+
@@ -637,12 +640,23 @@
Fix kqueue when overflowing the changes queue
Make sure the child worker process commits suicide if it could not start up
Don't log short responses at debug level 1
+Fix collapsed_forwarding for non-GET requests
See also the list of
squid-2.6.STABLE11 changes and the
ChangeLog file for details.
+
+
+
+
+
diff -ruN squid-2.6.STABLE11/configure squid-2.6.STABLE12/configure
--- squid-2.6.STABLE11/configure Fri Mar 16 17:51:34 2007
+++ squid-2.6.STABLE12/configure Tue Mar 20 15:35:44 2007
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.in Revision: 1.416.2.7 .
+# From configure.in Revision: 1.416.2.8 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Squid Web Proxy 2.6.STABLE11.
+# Generated by GNU Autoconf 2.59 for Squid Web Proxy 2.6.STABLE12.
#
# Report bugs to .
#
@@ -270,8 +270,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='2.6.STABLE11'
-PACKAGE_STRING='Squid Web Proxy 2.6.STABLE11'
+PACKAGE_VERSION='2.6.STABLE12'
+PACKAGE_STRING='Squid Web Proxy 2.6.STABLE12'
PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
ac_default_prefix=/usr/local/squid
@@ -781,7 +781,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.STABLE11 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 2.6.STABLE12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -847,7 +847,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE11:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE12:";;
esac
cat <<\_ACEOF
@@ -1158,7 +1158,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 2.6.STABLE11
+Squid Web Proxy configure 2.6.STABLE12
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1172,7 +1172,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.STABLE11, which was
+It was created by Squid Web Proxy $as_me 2.6.STABLE12, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1818,7 +1818,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='2.6.STABLE11'
+ VERSION='2.6.STABLE12'
cat >>confdefs.h <<_ACEOF
@@ -18612,7 +18612,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by Squid Web Proxy $as_me 2.6.STABLE11, which was
+This file was extended by Squid Web Proxy $as_me 2.6.STABLE12, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18675,7 +18675,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Squid Web Proxy config.status 2.6.STABLE11
+Squid Web Proxy config.status 2.6.STABLE12
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -ruN squid-2.6.STABLE11/configure.in squid-2.6.STABLE12/configure.in
--- squid-2.6.STABLE11/configure.in Fri Mar 16 17:51:34 2007
+++ squid-2.6.STABLE12/configure.in Tue Mar 20 15:35:44 2007
@@ -1,16 +1,16 @@
dnl
dnl Configuration input file for Squid
dnl
-dnl $Id: configure.in,v 1.416.2.7 2007/03/16 23:48:38 hno Exp $
+dnl $Id: configure.in,v 1.416.2.8 2007/03/20 21:34:20 hno Exp $
dnl
dnl
dnl
-AC_INIT(Squid Web Proxy, 2.6.STABLE11, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 2.6.STABLE12, 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.7 $)dnl
+AC_REVISION($Revision: 1.416.2.8 $)dnl
AC_PREFIX_DEFAULT(/usr/local/squid)
AM_MAINTAINER_MODE
diff -ruN squid-2.6.STABLE11/include/version.h squid-2.6.STABLE12/include/version.h
--- squid-2.6.STABLE11/include/version.h Fri Mar 16 17:51:34 2007
+++ squid-2.6.STABLE12/include/version.h Tue Mar 20 15:35:44 2007
@@ -9,5 +9,5 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1174089090
+#define SQUID_RELEASE_TIME 1174426541
#endif
diff -ruN squid-2.6.STABLE11/src/client_side.c squid-2.6.STABLE12/src/client_side.c
--- squid-2.6.STABLE11/src/client_side.c Wed Mar 14 08:11:26 2007
+++ squid-2.6.STABLE12/src/client_side.c Tue Mar 20 15:26:34 2007
@@ -1,6 +1,6 @@
/*
- * $Id: client_side.c,v 1.693.2.11 2007/03/14 14:11:26 hno Exp $
+ * $Id: client_side.c,v 1.693.2.12 2007/03/20 21:26:34 hno Exp $
*
* DEBUG: section 33 Client-side Routines
* AUTHOR: Duane Wessels
@@ -3339,7 +3339,6 @@
httpReplySetHeaders(rep, version, HTTP_OK, NULL, "text/plain",
httpRequestPrefixLen(r), 0, squid_curtime);
httpReplySwapOut(rep, http->entry);
- httpReplyDestroy(rep);
httpRequestSwapOut(r, http->entry);
storeComplete(http->entry);
return;