diff -u -r -N squid-3.1.13/ChangeLog squid-3.1.14/ChangeLog --- squid-3.1.13/ChangeLog 2011-07-01 14:48:17.000000000 +1200 +++ squid-3.1.14/ChangeLog 2011-07-04 16:38:34.000000000 +1200 @@ -1,3 +1,7 @@ +Changes to squid-3.1.14 (04 Jul 2011): + + - Regression Bug 3261: Could not create a DNS socket and exit + Changes to squid-3.1.13 (01 Jul 2011): - Regression Bug 3239: problems with myip/myport upgrade @@ -879,7 +883,7 @@ - the mailto links on Squid's ERR pages now contain data about the occurred error by default, so that the email will contain this data in its body. This feature can be disabled via the email_err_data directive. - (Clemens Löser) + (Clemens L?ser) - COSS now uses a file called stripe and the path in squid.conf is the directory this is placed in. Additionally squid -z will create the COSS swapfile. diff -u -r -N squid-3.1.13/configure squid-3.1.14/configure --- squid-3.1.13/configure 2011-07-01 14:50:54.000000000 +1200 +++ squid-3.1.14/configure 2011-07-04 16:40:34.000000000 +1200 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.1.13. +# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.1.14. # # Report bugs to . # @@ -575,8 +575,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='3.1.13' -PACKAGE_STRING='Squid Web Proxy 3.1.13' +PACKAGE_VERSION='3.1.14' +PACKAGE_STRING='Squid Web Proxy 3.1.14' PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/' PACKAGE_URL='' @@ -1539,7 +1539,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.1.13 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 3.1.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1609,7 +1609,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 3.1.13:";; + short | recursive ) echo "Configuration of Squid Web Proxy 3.1.14:";; esac cat <<\_ACEOF @@ -1940,7 +1940,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 3.1.13 +Squid Web Proxy configure 3.1.14 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2951,7 +2951,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.1.13, which was +It was created by Squid Web Proxy $as_me 3.1.14, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3770,7 +3770,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='3.1.13' + VERSION='3.1.14' cat >>confdefs.h <<_ACEOF @@ -28135,7 +28135,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.1.13, which was +This file was extended by Squid Web Proxy $as_me 3.1.14, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28201,7 +28201,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Squid Web Proxy config.status 3.1.13 +Squid Web Proxy config.status 3.1.14 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -u -r -N squid-3.1.13/configure.ac squid-3.1.14/configure.ac --- squid-3.1.13/configure.ac 2011-07-01 14:50:53.000000000 +1200 +++ squid-3.1.14/configure.ac 2011-07-04 16:40:34.000000000 +1200 @@ -2,7 +2,7 @@ dnl dnl $Id$ dnl -AC_INIT([Squid Web Proxy],[3.1.13],[http://www.squid-cache.org/bugs/],[squid]) +AC_INIT([Squid Web Proxy],[3.1.14],[http://www.squid-cache.org/bugs/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) diff -u -r -N squid-3.1.13/include/version.h squid-3.1.14/include/version.h --- squid-3.1.13/include/version.h 2011-07-01 14:50:54.000000000 +1200 +++ squid-3.1.14/include/version.h 2011-07-04 16:40:34.000000000 +1200 @@ -9,7 +9,7 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1309488494 +#define SQUID_RELEASE_TIME 1309754312 #endif #ifndef APP_SHORTNAME diff -u -r -N squid-3.1.13/RELEASENOTES.html squid-3.1.14/RELEASENOTES.html --- squid-3.1.13/RELEASENOTES.html 2011-07-01 15:35:59.000000000 +1200 +++ squid-3.1.14/RELEASENOTES.html 2011-07-04 17:07:10.000000000 +1200 @@ -2,10 +2,10 @@ - Squid 3.1.13 release notes + Squid 3.1.14 release notes -

Squid 3.1.13 release notes

+

Squid 3.1.14 release notes

Squid Developers

@@ -71,7 +71,7 @@

1. Notice

-

The Squid Team are pleased to announce the release of Squid-3.1.13

+

The Squid Team are pleased to announce the release of Squid-3.1.14

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

diff -u -r -N squid-3.1.13/src/forward.cc squid-3.1.14/src/forward.cc --- squid-3.1.13/src/forward.cc 2011-07-01 14:48:17.000000000 +1200 +++ squid-3.1.14/src/forward.cc 2011-07-04 16:38:34.000000000 +1200 @@ -756,8 +756,10 @@ if ((fs->_peer && fs->_peer->use_ssl) || (!fs->_peer && request->protocol == PROTO_HTTPS)) { - initiateSSL(); - return; + if (fs->code != PINNED) { + initiateSSL(); + return; + } } #endif diff -u -r -N squid-3.1.13/src/ip/IpAddress.cc squid-3.1.14/src/ip/IpAddress.cc --- squid-3.1.13/src/ip/IpAddress.cc 2011-07-01 14:48:17.000000000 +1200 +++ squid-3.1.14/src/ip/IpAddress.cc 2011-07-04 16:38:34.000000000 +1200 @@ -199,7 +199,7 @@ bool IpAddress::IsAnyAddr() const { - return IN6_IS_ADDR_UNSPECIFIED( &m_SocketAddr.sin6_addr ) || IN6_ARE_ADDR_EQUAL( &m_SocketAddr.sin6_addr, &v4_anyaddr); + return IN6_IS_ADDR_UNSPECIFIED( &m_SocketAddr.sin6_addr ); } /// NOTE: Does NOT clear the Port stored. Ony the Address and Type.