diff -u -r -N squid-3.2.0.11/ChangeLog squid-3.2.0.12/ChangeLog
--- squid-3.2.0.11/ChangeLog 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/ChangeLog 2011-09-16 23:37:30.000000000 +1200
@@ -1,3 +1,21 @@
+Changes to squid-3.2.0.12 (17 Sep 2011):
+
+ - Regression Bug 3335: ICAP service is down
+ - Regression Bug 3322: adapt:: and icap:: format codes do not parse
+ - Regression Bug 3303: Support for non-English usernames in log files
+ - Regression Bug 3259: assertion failed: Connection.cc:29: 'fd<0' after REVIVED PARENT
+ - Regression: %I shows hostname on SSL error page
+ - Regression: FTP outgoing port always 'in use' on PASV connections
+ - Bug 3337: (partial) status 200 is not accepted for deny_info
+ - Bug 3319: Inconsistencies in error messages
+ - Bug 3281: pconn in-use while closing assertion
+ - Bug 3243: Fix cases: raw-IPv6, case variant FQDN, internal request
+ - Fixed max-stale check. Entities not exceeding max-stale were marked as stale
+ - Adjust format code %la for intercepted connections
+ - Log ICAP_ERR_GONE ICAP transaction outcome when ICAP initiator disappears early
+ - Send RST packet when closing an ICAP connection after a transaction error
+ - Support maximum field width for string access.log fields
+
Changes to squid-3.2.0.11 (28 Aug 2011):
- Bug 3243: CVE-2009-0801 Bypass of browser same-origin access control
diff -u -r -N squid-3.2.0.11/configure squid-3.2.0.12/configure
--- squid-3.2.0.11/configure 2011-08-29 03:12:23.000000000 +1200
+++ squid-3.2.0.12/configure 2011-09-16 23:38:35.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.2.0.11.
+# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.2.0.12.
#
# Report bugs to .
#
@@ -575,8 +575,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.2.0.11'
-PACKAGE_STRING='Squid Web Proxy 3.2.0.11'
+PACKAGE_VERSION='3.2.0.12'
+PACKAGE_STRING='Squid Web Proxy 3.2.0.12'
PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/'
PACKAGE_URL=''
@@ -1570,7 +1570,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.2.0.11 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.2.0.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1640,7 +1640,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 3.2.0.11:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 3.2.0.12:";;
esac
cat <<\_ACEOF
@@ -2018,7 +2018,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 3.2.0.11
+Squid Web Proxy configure 3.2.0.12
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3114,7 +3114,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.2.0.11, which was
+It was created by Squid Web Proxy $as_me 3.2.0.12, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3933,7 +3933,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='3.2.0.11'
+ VERSION='3.2.0.12'
cat >>confdefs.h <<_ACEOF
@@ -30543,7 +30543,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.2.0.11, which was
+This file was extended by Squid Web Proxy $as_me 3.2.0.12, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -30609,7 +30609,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.2.0.11
+Squid Web Proxy config.status 3.2.0.12
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -u -r -N squid-3.2.0.11/configure.ac squid-3.2.0.12/configure.ac
--- squid-3.2.0.11/configure.ac 2011-08-29 03:12:23.000000000 +1200
+++ squid-3.2.0.12/configure.ac 2011-09-16 23:38:35.000000000 +1200
@@ -3,7 +3,7 @@
dnl
dnl
dnl
-AC_INIT([Squid Web Proxy],[3.2.0.11],[http://www.squid-cache.org/bugs/],[squid])
+AC_INIT([Squid Web Proxy],[3.2.0.12],[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.2.0.11/errors/af/ERR_AGENT_CONFIGURE squid-3.2.0.12/errors/af/ERR_AGENT_CONFIGURE
--- squid-3.2.0.11/errors/af/ERR_AGENT_CONFIGURE 2011-08-29 03:16:15.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_AGENT_CONFIGURE 2011-09-16 23:39:40.000000000 +1200
@@ -1 +1 @@
-
Webblaaier se opstelling
FOUT
Web Browser Configuration
Your Web Browser configuration needs to be corrected to use this network.
How to find these settings in your browser:
For Firefox browsers go to:
- Tools -> Options -> Advanced -> Network -> Connection Settings
- In the HTTP proxy box type the proxy name %h and port %b.
For Internet Explorer browsers go to:
- Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
- In the HTTP proxy box type the proxy name %h and port %b.
For Opera browsers go to:
- Tools -> Preferences -> Advanced -> Network -> Proxy Servers
- In the HTTP proxy box type the proxy name %h and port %b.
Die kasbediener se administrateur is %w.
\ No newline at end of file
+ Webblaaier se opstelling
FOUT
Web Browser Configuration
Die opstelling van u webblaaier moet reggestel word om hierdie netwerk te gebruik.
Hoe om hierdie instellings in die blaaier te vind:
Vir Firefox-blaaiers, gaan na:
- Nutsgoed -> Opsies -> Gevorderd -> Netwerk -> Verbinding
- In the HTTP proxy box type the proxy name %h and port %b.
Vir Internet Explorer-blaaiers, gaan na:
- Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
- In the HTTP proxy box type the proxy name %h and port %b.
Vir Opera-blaaiers, gaan na:
- Tools -> Preferences -> Advanced -> Network -> Proxy Servers
- In the HTTP proxy box type the proxy name %h and port %b.
Die kasbediener se administrateur is %w.
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/errors/af/ERR_AGENT_WPAD squid-3.2.0.12/errors/af/ERR_AGENT_WPAD
--- squid-3.2.0.11/errors/af/ERR_AGENT_WPAD 2011-08-29 03:16:16.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_AGENT_WPAD 2011-09-16 23:39:41.000000000 +1200
@@ -1 +1 @@
- Webblaaier se opstelling
FOUT
Web Browser Configuration
Your Web Browser configuration needs to be corrected to use this network.
How to find these settings in your browser:
For Firefox browsers go to:
- Tools -> Options -> Advanced -> Network -> Connection Settings
- Select Auto-detect proxy settings for this network
For Internet Explorer browsers go to:
- Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
- Select Automatically detect settings
For Opera browsers go to:
- Tools -> Preferences -> Advanced -> Network -> Proxy Servers
- Select Use Automatic proxy configuration
Die kasbediener se administrateur is %w.
\ No newline at end of file
+ Webblaaier se opstelling
FOUT
Web Browser Configuration
Die opstelling van u webblaaier moet reggestel word om hierdie netwerk te gebruik.
Hoe om hierdie instellings in die blaaier te vind:
Vir Firefox-blaaiers, gaan na:
- Nutsgoed -> Opsies -> Gevorderd -> Netwerk -> Verbinding
- Kies "Outospeur instaanopstelling vir hierdie netwerk"
Vir Internet Explorer-blaaiers, gaan na:
- Tools -> Internet Options -> Connection -> LAN Settings ->Proxy
- Select Automatically detect settings
Vir Opera-blaaiers, gaan na:
- Tools -> Preferences -> Advanced -> Network -> Proxy Servers
- Select Use Automatic proxy configuration
Die kasbediener se administrateur is %w.
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/errors/af/ERR_DIR_LISTING squid-3.2.0.12/errors/af/ERR_DIR_LISTING
--- squid-3.2.0.11/errors/af/ERR_DIR_LISTING 2011-08-29 03:16:20.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_DIR_LISTING 2011-09-16 23:39:43.000000000 +1200
@@ -1 +1 @@
- Gids: %U
\ No newline at end of file
+ Gids: %U
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/errors/af/ERR_DNS_FAIL squid-3.2.0.12/errors/af/ERR_DNS_FAIL
--- squid-3.2.0.11/errors/af/ERR_DNS_FAIL 2011-08-29 03:16:21.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_DNS_FAIL 2011-09-16 23:39:44.000000000 +1200
@@ -1 +1 @@
- FOUT: Die aangevraagde URL kon nie verkry word nie
ERROR
The requested URL could not be retrieved
Die volgende fout is teëgekom tydens verkryging van die URL: %U
Kan nie IP-adres vanaf gasheernaam %H
bepaal nie
Die DNS-bediener het geantwoord:
%z
This means that the cache was not able to resolve the hostname presented in the URL. Check if the address is correct.
Die kasbediener se administrateur is %w.
\ No newline at end of file
+ FOUT: Die aangevraagde URL kon nie verkry word nie
ERROR
The requested URL could not be retrieved
Die volgende fout is teëgekom tydens verkryging van die URL: %U
Kan nie IP-adres vanaf gasheernaam %H
bepaal nie
Die DNS-bediener het geantwoord:
%z
Dit beteken dat die kasbediener nie in staat was om die gasheernaam in die URL op te los nie. Kyk of die adres korrek is.
Die kasbediener se administrateur is %w.
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/errors/af/ERR_FTP_PUT_CREATED squid-3.2.0.12/errors/af/ERR_FTP_PUT_CREATED
--- squid-3.2.0.11/errors/af/ERR_FTP_PUT_CREATED 2011-08-29 03:16:24.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_FTP_PUT_CREATED 2011-09-16 23:39:47.000000000 +1200
@@ -1 +1 @@
- FTP PUT Successful.
Bewerking suksesvol
Lêer is geskep
\ No newline at end of file
+ FTP PUT suksesvol.
Bewerking suksesvol
Lêer is geskep
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/errors/af/ERR_FTP_PUT_ERROR squid-3.2.0.12/errors/af/ERR_FTP_PUT_ERROR
--- squid-3.2.0.11/errors/af/ERR_FTP_PUT_ERROR 2011-08-29 03:16:26.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_FTP_PUT_ERROR 2011-09-16 23:39:48.000000000 +1200
@@ -1 +1 @@
- FOUT: FTP upload failed
ERROR
FTP PUT upload failed
'n FTP-protokolfout het voorgekom tydens verkryging van die URL: %U
Squid het die volgende FTP-opdrag gestuur:
%f
Die bediener het geantwoord met:
%F
Dit beteken dat die FTP-bediener dalk nie toestemming of ruimte het om die lêer te stoor nie. Kontroleer die pad, toestemmings, skyfspasie en probeer weer.
Die kasbediener se administrateur is %w.
\ No newline at end of file
+ FOUT: FTP upload failed
ERROR
FTP PUT-oplaai het misluk
'n FTP-protokolfout het voorgekom tydens verkryging van die URL: %U
Squid het die volgende FTP-opdrag gestuur:
%f
Die bediener het geantwoord met:
%F
Dit beteken dat die FTP-bediener dalk nie toestemming of ruimte het om die lêer te stoor nie. Kontroleer die pad, toestemmings, skyfspasie en probeer weer.
Die kasbediener se administrateur is %w.
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/errors/af/ERR_FTP_PUT_MODIFIED squid-3.2.0.12/errors/af/ERR_FTP_PUT_MODIFIED
--- squid-3.2.0.11/errors/af/ERR_FTP_PUT_MODIFIED 2011-08-29 03:16:26.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_FTP_PUT_MODIFIED 2011-09-16 23:39:48.000000000 +1200
@@ -1 +1 @@
- FTP PUT Successful.
Bewerking suksesvol
Lêer is opgedateer
\ No newline at end of file
+ FTP PUT suksesvol.
Bewerking suksesvol
Lêer is opgedateer
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/errors/af/ERR_ONLY_IF_CACHED_MISS squid-3.2.0.12/errors/af/ERR_ONLY_IF_CACHED_MISS
--- squid-3.2.0.11/errors/af/ERR_ONLY_IF_CACHED_MISS 2011-08-29 03:16:32.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_ONLY_IF_CACHED_MISS 2011-09-16 23:39:53.000000000 +1200
@@ -1 +1 @@
- FOUT: Die aangevraagde URL kon nie verkry word nie
ERROR
The requested URL could not be retrieved
Die volgende fout is teëgekom tydens verkryging van die URL: %U
Valid document was not found in the cache and only-if-cached
directive was specified.
You have issued a request with a only-if-cached
cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached
directive.
Die kasbediener se administrateur is %w.
\ No newline at end of file
+ FOUT: Die aangevraagde URL kon nie verkry word nie
ERROR
The requested URL could not be retrieved
Die volgende fout is teëgekom tydens verkryging van die URL: %U
Geldige dokument is nie in die kas gevind nie, en only-if-cached
is gespesifiseer.
You have issued a request with a only-if-cached
cache control directive. The document was not found in the cache, or it required revalidation prohibited by the only-if-cached
directive.
Die kasbediener se administrateur is %w.
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/errors/af/ERR_SOCKET_FAILURE squid-3.2.0.12/errors/af/ERR_SOCKET_FAILURE
--- squid-3.2.0.11/errors/af/ERR_SOCKET_FAILURE 2011-08-29 03:16:35.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_SOCKET_FAILURE 2011-09-16 23:39:55.000000000 +1200
@@ -1 +1 @@
- FOUT: Die aangevraagde URL kon nie verkry word nie
ERROR
The requested URL could not be retrieved
Die volgende fout is teëgekom tydens verkryging van die URL: %U
Sokfout
Die stelsel het die volgende teruggestuur: %E
Squid is unable to create a TCP socket, presumably due to excessive load. Please retry your request.
Die kasbediener se administrateur is %w.
\ No newline at end of file
+ FOUT: Die aangevraagde URL kon nie verkry word nie
ERROR
The requested URL could not be retrieved
Die volgende fout is teëgekom tydens verkryging van die URL: %U
Sokfout
Die stelsel het die volgende teruggestuur: %E
Squid kan nie 'n TCP-sok skep nie, vermoedelik weens hoë lading. Probeer die navraag gerus weer.
Die kasbediener se administrateur is %w.
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/errors/af/ERR_UNSUP_REQ squid-3.2.0.12/errors/af/ERR_UNSUP_REQ
--- squid-3.2.0.11/errors/af/ERR_UNSUP_REQ 2011-08-29 03:16:37.000000000 +1200
+++ squid-3.2.0.12/errors/af/ERR_UNSUP_REQ 2011-09-16 23:39:57.000000000 +1200
@@ -1 +1 @@
- FOUT: Die aangevraagde URL kon nie verkry word nie
ERROR
The requested URL could not be retrieved
Die volgende fout is teëgekom tydens verkryging van die URL: %U
Unsupported Request Method and Protocol
Squid ondersteun nie alle navraagmetodes vir alle toegangsprotokolle nie. Mens kan by voorbeeld nie 'n Gopher-navraag POST nie.
Die kasbediener se administrateur is %w.
\ No newline at end of file
+ FOUT: Die aangevraagde URL kon nie verkry word nie
ERROR
The requested URL could not be retrieved
Die volgende fout is teëgekom tydens verkryging van die URL: %U
Niegesteunde versoekmetode en -protokol
Squid ondersteun nie alle navraagmetodes vir alle toegangsprotokolle nie. Mens kan by voorbeeld nie 'n Gopher-navraag POST nie.
Die kasbediener se administrateur is %w.
\ No newline at end of file
diff -u -r -N squid-3.2.0.11/helpers/basic_auth/DB/basic_db_auth.8 squid-3.2.0.12/helpers/basic_auth/DB/basic_db_auth.8
--- squid-3.2.0.11/helpers/basic_auth/DB/basic_db_auth.8 2011-08-29 03:38:13.000000000 +1200
+++ squid-3.2.0.12/helpers/basic_auth/DB/basic_db_auth.8 2011-09-16 23:54:03.000000000 +1200
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "BASIC_DB_AUTH 1"
-.TH BASIC_DB_AUTH 1 "2011-08-28" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH BASIC_DB_AUTH 1 "2011-09-16" "perl v5.10.1" "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -u -r -N squid-3.2.0.11/helpers/basic_auth/DB/basic_db_auth.pl.in squid-3.2.0.12/helpers/basic_auth/DB/basic_db_auth.pl.in
--- squid-3.2.0.11/helpers/basic_auth/DB/basic_db_auth.pl.in 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/helpers/basic_auth/DB/basic_db_auth.pl.in 2011-09-16 23:37:30.000000000 +1200
@@ -127,6 +127,12 @@
$_dbh = DBI->connect($dsn, $db_user, $db_passwd);
if (!defined $_dbh) {
warn ("Could not connect to $dsn\n");
+ my @driver_names = DBI->available_drivers();
+ my $msg = "DSN drivers apparently installed, available:\n";
+ foreach my $dn (@driver_names) {
+ $msg .= "\t$dn";
+ }
+ warn($msg."\n");
return undef;
}
my $sql_query;
diff -u -r -N squid-3.2.0.11/helpers/basic_auth/NCSA/basic_ncsa_auth.cc squid-3.2.0.12/helpers/basic_auth/NCSA/basic_ncsa_auth.cc
--- squid-3.2.0.11/helpers/basic_auth/NCSA/basic_ncsa_auth.cc 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/helpers/basic_auth/NCSA/basic_ncsa_auth.cc 2011-09-16 23:37:30.000000000 +1200
@@ -143,6 +143,9 @@
} else if (strlen(passwd) <= 8 && strcmp(u->passwd, (char *) crypt(passwd, u->passwd)) == 0) {
// Bug 3107: crypt() DES functionality silently truncates long passwords.
SEND_OK("");
+ } else if (strlen(passwd) > 8 && strcmp(u->passwd, (char *) crypt(passwd, u->passwd)) == 0) {
+ // Bug 3107: crypt() DES functionality silently truncates long passwords.
+ SEND_ERR("Password too long. Only 8 characters accepted.");
#endif
} else if (strcmp(u->passwd, (char *) crypt_md5(passwd, u->passwd)) == 0) {
SEND_OK("");
diff -u -r -N squid-3.2.0.11/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 squid-3.2.0.12/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8
--- squid-3.2.0.11/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2011-08-29 03:38:47.000000000 +1200
+++ squid-3.2.0.12/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2011-09-16 23:54:05.000000000 +1200
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_WBINFO_GROUP_ACL.PL.IN 1"
-.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2011-08-28" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2011-09-16" "perl v5.10.1" "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -u -r -N squid-3.2.0.11/include/Array.h squid-3.2.0.12/include/Array.h
--- squid-3.2.0.11/include/Array.h 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/include/Array.h 2011-09-16 23:37:30.000000000 +1200
@@ -97,6 +97,8 @@
Vector &operator += (E item) {push_back(item); return *this;};
void insert (E);
+ const E &front() const;
+ E &front();
E &back();
E pop_back();
E shift(); // aka pop_front
@@ -251,6 +253,22 @@
}
template
+const E &
+Vector::front() const
+{
+ assert (size());
+ return items[0];
+}
+
+template
+E &
+Vector::front()
+{
+ assert (size());
+ return items[0];
+}
+
+template
void
Vector::prune(E item)
{
diff -u -r -N squid-3.2.0.11/include/version.h squid-3.2.0.12/include/version.h
--- squid-3.2.0.11/include/version.h 2011-08-29 03:12:23.000000000 +1200
+++ squid-3.2.0.12/include/version.h 2011-09-16 23:38:35.000000000 +1200
@@ -9,7 +9,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1314544159
+#define SQUID_RELEASE_TIME 1316173049
#endif
#ifndef APP_SHORTNAME
diff -u -r -N squid-3.2.0.11/RELEASENOTES.html squid-3.2.0.12/RELEASENOTES.html
--- squid-3.2.0.11/RELEASENOTES.html 2011-08-29 03:42:01.000000000 +1200
+++ squid-3.2.0.12/RELEASENOTES.html 2011-09-16 23:54:10.000000000 +1200
@@ -2,10 +2,10 @@
- Squid 3.2.0.11 release notes
+ Squid 3.2.0.12 release notes
-Squid 3.2.0.11 release notes
+Squid 3.2.0.12 release notes
Squid Developers
@@ -73,7 +73,7 @@
-The Squid Team are pleased to announce the release of Squid-3.2.0.11 for testing.
+The Squid Team are pleased to announce the release of Squid-3.2.0.12 for testing.
This new release is available for download from
http://www.squid-cache.org/Versions/v3/3.2/ or the
mirrors.
diff -u -r -N squid-3.2.0.11/src/AccessLogEntry.h squid-3.2.0.12/src/AccessLogEntry.h
--- squid-3.2.0.11/src/AccessLogEntry.h 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/src/AccessLogEntry.h 2011-09-16 23:37:30.000000000 +1200
@@ -39,6 +39,7 @@
#if ICAP_CLIENT
#include "adaptation/icap/Elements.h"
#endif
+#include "ProtoPort.h"
/* forward decls */
class HttpReply;
@@ -148,6 +149,7 @@
const char *ssluser;
#endif
+ http_port_list *port;
} cache;
diff -u -r -N squid-3.2.0.11/src/adaptation/icap/Elements.cc squid-3.2.0.12/src/adaptation/icap/Elements.cc
--- squid-3.2.0.11/src/adaptation/icap/Elements.cc 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/src/adaptation/icap/Elements.cc 2011-09-16 23:37:30.000000000 +1200
@@ -8,6 +8,7 @@
{
const XactOutcome xoUnknown = "ICAP_ERR_UNKNOWN";
+const XactOutcome xoGone = "ICAP_ERR_GONE";
const XactOutcome xoRace = "ICAP_ERR_RACE";
const XactOutcome xoError = "ICAP_ERR_OTHER";
const XactOutcome xoOpt = "ICAP_OPT";
diff -u -r -N squid-3.2.0.11/src/adaptation/icap/Elements.h squid-3.2.0.12/src/adaptation/icap/Elements.h
--- squid-3.2.0.11/src/adaptation/icap/Elements.h 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/src/adaptation/icap/Elements.h 2011-09-16 23:37:30.000000000 +1200
@@ -64,6 +64,7 @@
typedef const char *XactOutcome; ///< transaction result for logging
extern const XactOutcome xoUnknown; ///< initial value: outcome was not set
+extern const XactOutcome xoGone; ///< initiator gone, will not continue
extern const XactOutcome xoRace; ///< ICAP server closed pconn when we started
extern const XactOutcome xoError; ///< all kinds of transaction errors
extern const XactOutcome xoOpt; ///< OPTION transaction
diff -u -r -N squid-3.2.0.11/src/adaptation/icap/ServiceRep.cc squid-3.2.0.12/src/adaptation/icap/ServiceRep.cc
--- squid-3.2.0.11/src/adaptation/icap/ServiceRep.cc 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/src/adaptation/icap/ServiceRep.cc 2011-09-16 23:37:30.000000000 +1200
@@ -115,7 +115,7 @@
}
// pools connection if it is reusable or closes it
-void Adaptation::Icap::ServiceRep::putConnection(const Comm::ConnectionPointer &conn, bool isReusable, const char *comment)
+void Adaptation::Icap::ServiceRep::putConnection(const Comm::ConnectionPointer &conn, bool isReusable, bool sendReset, const char *comment)
{
Must(Comm::IsConnOpen(conn));
// do not pool an idle connection if we owe connections
@@ -124,9 +124,14 @@
commUnsetConnTimeout(conn);
theIdleConns->push(conn);
} else {
- debugs(93, 3, HERE << "closing pconn" << comment);
- // comm_close will clear timeout
- conn->close();
+ debugs(93, 3, HERE << (sendReset ? "RST" : "FIN") << "-closing " <<
+ comment);
+ // comm_close called from Connection::close will clear timeout
+ // TODO: add "bool sendReset = false" to Connection::close()?
+ if (sendReset)
+ comm_reset_close(conn);
+ else
+ conn->close();
}
Must(theBusyConns > 0);
diff -u -r -N squid-3.2.0.11/src/adaptation/icap/ServiceRep.h squid-3.2.0.12/src/adaptation/icap/ServiceRep.h
--- squid-3.2.0.11/src/adaptation/icap/ServiceRep.h 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/src/adaptation/icap/ServiceRep.h 2011-09-16 23:37:30.000000000 +1200
@@ -111,7 +111,7 @@
bool allows204() const;
bool allows206() const;
Comm::ConnectionPointer getConnection(bool isRetriable, bool &isReused);
- void putConnection(const Comm::ConnectionPointer &conn, bool isReusable, const char *comment);
+ void putConnection(const Comm::ConnectionPointer &conn, bool isReusable, bool sendReset, const char *comment);
void noteConnectionUse(const Comm::ConnectionPointer &conn);
void noteConnectionFailed(const char *comment);
diff -u -r -N squid-3.2.0.11/src/adaptation/icap/Xaction.cc squid-3.2.0.12/src/adaptation/icap/Xaction.cc
--- squid-3.2.0.11/src/adaptation/icap/Xaction.cc 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/src/adaptation/icap/Xaction.cc 2011-09-16 23:37:30.000000000 +1200
@@ -204,8 +204,11 @@
if (reuseConnection)
disableRetries();
+ const bool reset = !reuseConnection &&
+ (al.icap.outcome == xoGone || al.icap.outcome == xoError);
+
Adaptation::Icap::ServiceRep &s = service();
- s.putConnection(connection, reuseConnection, status());
+ s.putConnection(connection, reuseConnection, reset, status());
writer = NULL;
reader = NULL;
@@ -476,8 +479,10 @@
{
if (theInitiator.set()) {
+ debugs(93,4, HERE << "Initiator gone before ICAP transaction ended");
clearInitiator();
detailError(ERR_DETAIL_ICAP_INIT_GONE);
+ setOutcome(xoGone);
mustStop("initiator aborted");
}
diff -u -r -N squid-3.2.0.11/src/auth/basic/UserRequest.cc squid-3.2.0.12/src/auth/basic/UserRequest.cc
--- squid-3.2.0.11/src/auth/basic/UserRequest.cc 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/src/auth/basic/UserRequest.cc 2011-09-16 23:37:30.000000000 +1200
@@ -140,7 +140,7 @@
BasicAuthQueueNode *tmpnode;
char *t = NULL;
void *cbdata;
- debugs(29, 9, HERE << "{" << (reply ? reply : "") << "}");
+ debugs(29, 5, HERE << "{" << (reply ? reply : "") << "}");
if (reply) {
if ((t = strchr(reply, ' ')))
diff -u -r -N squid-3.2.0.11/src/base/Makefile.am squid-3.2.0.12/src/base/Makefile.am
--- squid-3.2.0.11/src/base/Makefile.am 2011-08-29 03:09:21.000000000 +1200
+++ squid-3.2.0.12/src/base/Makefile.am 2011-09-16 23:37:30.000000000 +1200
@@ -15,6 +15,8 @@
TidyPointer.h \
CbcPointer.h \
InstanceId.h \
+ RunnersRegistry.cc \
+ RunnersRegistry.h \
Subscription.h \
TextException.cc \
TextException.h
diff -u -r -N squid-3.2.0.11/src/base/Makefile.in squid-3.2.0.12/src/base/Makefile.in
--- squid-3.2.0.11/src/base/Makefile.in 2011-08-29 03:11:51.000000000 +1200
+++ squid-3.2.0.12/src/base/Makefile.in 2011-09-16 23:38:18.000000000 +1200
@@ -57,7 +57,7 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libbase_la_LIBADD =
am_libbase_la_OBJECTS = AsyncCall.lo AsyncJob.lo AsyncCallQueue.lo \
- TextException.lo
+ RunnersRegistry.lo TextException.lo
libbase_la_OBJECTS = $(am_libbase_la_OBJECTS)
DEFAULT_INCLUDES =
depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp
@@ -320,6 +320,8 @@
TidyPointer.h \
CbcPointer.h \
InstanceId.h \
+ RunnersRegistry.cc \
+ RunnersRegistry.h \
Subscription.h \
TextException.cc \
TextException.h
@@ -388,6 +390,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AsyncCall.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AsyncCallQueue.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AsyncJob.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RunnersRegistry.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextException.Plo@am__quote@
.cc.o:
diff -u -r -N squid-3.2.0.11/src/base/RunnersRegistry.cc squid-3.2.0.12/src/base/RunnersRegistry.cc
--- squid-3.2.0.11/src/base/RunnersRegistry.cc 1970-01-01 12:00:00.000000000 +1200
+++ squid-3.2.0.12/src/base/RunnersRegistry.cc 2011-09-16 23:37:30.000000000 +1200
@@ -0,0 +1,58 @@
+#include "config.h"
+#include "base/RunnersRegistry.h"
+#include
+#include