diff -u -r -N squid-3.0.STABLE23/ChangeLog squid-3.0.STABLE24/ChangeLog --- squid-3.0.STABLE23/ChangeLog 2010-02-02 22:49:51.000000000 +1300 +++ squid-3.0.STABLE24/ChangeLog 2010-02-13 02:52:58.000000000 +1300 @@ -1,3 +1,8 @@ +Changes to squid-3.0.STABLE24 (13 Feb 2010): + + - Bug 2858: Segment violation in HTCP + - Updated refresh pattern for dynamic pages + Changes to squid-3.0.STABLE23 (02 Feb 2010): - Bug 2856: removing assert() required for 3.0 patch for SQUID-2010:1 diff -u -r -N squid-3.0.STABLE23/configure squid-3.0.STABLE24/configure --- squid-3.0.STABLE23/configure 2010-02-02 22:50:03.000000000 +1300 +++ squid-3.0.STABLE24/configure 2010-02-13 02:53:20.000000000 +1300 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.62 for Squid Web Proxy 3.0.STABLE23. +# Generated by GNU Autoconf 2.62 for Squid Web Proxy 3.0.STABLE24. # # Report bugs to . # @@ -751,8 +751,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='3.0.STABLE23' -PACKAGE_STRING='Squid Web Proxy 3.0.STABLE23' +PACKAGE_VERSION='3.0.STABLE24' +PACKAGE_STRING='Squid Web Proxy 3.0.STABLE24' PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/' ac_unique_file="src/main.cc" @@ -1663,7 +1663,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 3.0.STABLE23 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 3.0.STABLE24 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1733,7 +1733,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 3.0.STABLE23:";; + short | recursive ) echo "Configuration of Squid Web Proxy 3.0.STABLE24:";; esac cat <<\_ACEOF @@ -2047,7 +2047,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 3.0.STABLE23 +Squid Web Proxy configure 3.0.STABLE24 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2061,7 +2061,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 3.0.STABLE23, which was +It was created by Squid Web Proxy $as_me 3.0.STABLE24, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -2779,7 +2779,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='3.0.STABLE23' + VERSION='3.0.STABLE24' cat >>confdefs.h <<_ACEOF @@ -48207,7 +48207,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 3.0.STABLE23, which was +This file was extended by Squid Web Proxy $as_me 3.0.STABLE24, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -48260,7 +48260,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -Squid Web Proxy config.status 3.0.STABLE23 +Squid Web Proxy config.status 3.0.STABLE24 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -u -r -N squid-3.0.STABLE23/configure.in squid-3.0.STABLE24/configure.in --- squid-3.0.STABLE23/configure.in 2010-02-02 22:50:03.000000000 +1300 +++ squid-3.0.STABLE24/configure.in 2010-02-13 02:53:20.000000000 +1300 @@ -1,7 +1,7 @@ dnl Configuration input file for Squid dnl dnl -AC_INIT(Squid Web Proxy, 3.0.STABLE23, http://www.squid-cache.org/bugs/, squid) +AC_INIT(Squid Web Proxy, 3.0.STABLE24, http://www.squid-cache.org/bugs/, squid) AC_PREREQ(2.52) AM_CONFIG_HEADER(include/autoconf.h) AC_CONFIG_AUX_DIR(cfgaux) diff -u -r -N squid-3.0.STABLE23/include/version.h squid-3.0.STABLE24/include/version.h --- squid-3.0.STABLE23/include/version.h 2010-02-02 22:50:03.000000000 +1300 +++ squid-3.0.STABLE24/include/version.h 2010-02-13 02:53:20.000000000 +1300 @@ -9,5 +9,5 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1265104190 +#define SQUID_RELEASE_TIME 1265982776 #endif diff -u -r -N squid-3.0.STABLE23/RELEASENOTES.html squid-3.0.STABLE24/RELEASENOTES.html --- squid-3.0.STABLE23/RELEASENOTES.html 2010-02-02 22:51:10.000000000 +1300 +++ squid-3.0.STABLE24/RELEASENOTES.html 2010-02-13 02:54:16.000000000 +1300 @@ -1,11 +1,11 @@ - - Squid 3.0.STABLE23 release notes + + Squid 3.0.STABLE24 release notes -

Squid 3.0.STABLE23 release notes

+

Squid 3.0.STABLE24 release notes

Squid Developers

@@ -60,7 +60,7 @@

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.0.STABLE23.

+

The Squid Team are pleased to announce the release of Squid-3.0.STABLE24.

This new release is available for download from http://www.squid-cache.org/Versions/v3/3.0/ or the mirrors.

diff -u -r -N squid-3.0.STABLE23/src/cf.data.pre squid-3.0.STABLE24/src/cf.data.pre --- squid-3.0.STABLE23/src/cf.data.pre 2010-02-02 22:50:01.000000000 +1300 +++ squid-3.0.STABLE24/src/cf.data.pre 2010-02-13 02:53:17.000000000 +1300 @@ -2624,10 +2624,10 @@ 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 +refresh_pattern ^ftp: 1440 20% 10080 +refresh_pattern ^gopher: 1440 0% 1440 +refresh_pattern -i (/cgi-bin/|\?) 0 0% 0 +refresh_pattern . 0 20% 4320 NOCOMMENT_END DOC_END diff -u -r -N squid-3.0.STABLE23/src/htcp.cc squid-3.0.STABLE24/src/htcp.cc --- squid-3.0.STABLE23/src/htcp.cc 2010-02-02 22:50:02.000000000 +1300 +++ squid-3.0.STABLE24/src/htcp.cc 2010-02-13 02:53:18.000000000 +1300 @@ -1298,6 +1298,12 @@ return; } + if (!s->request) { + debugs(31, 2, "htcpHandleTstRequest: failed to parse request"); + htcpFreeSpecifier(s); + return; + } + if (!htcpAccessCheck(Config.accessList.htcp_clr, s, from)) { debugs(31, 2, "htcpHandleClr: Access denied");