diff -u -r -N squid-3.3.2/ChangeLog squid-3.3.3/ChangeLog
--- squid-3.3.2/ChangeLog 2013-03-02 15:36:58.000000000 +1300
+++ squid-3.3.3/ChangeLog 2013-03-12 23:17:07.000000000 +1300
@@ -1,3 +1,8 @@
+Changes to squid-3.3.3 (12 Mar 2013):
+
+ - Bug 3720: Add missing include in /dev/poll I/O module (pt2)
+ - ... and all changes from squid 3.2.9
+
Changes to squid-3.3.2 (02 Mar 2013):
- Bug 3781: Proxy Authentication not sent to cache_peer
@@ -50,6 +55,13 @@
- ... and many compile error fixes
- ... and a very large amount of code polish for faster compilation
+Changes to squid-3.2.9 (12 Mar 2013):
+
+ - Regression fix: Accept-Language header parse
+ - Bug 3673: Silence 'Failed to select source' messages
+ - Fix authentication headers sent on peer digest requests
+ - Fix build error on Solaris, OpenIndiana, Omnios
+
Changes to squid-3.2.8 (02 Mar 2013):
- Bug 3767: tcp_outgoing_tos/mark ACLs do not obey acl_uses_indirect_client
diff -u -r -N squid-3.3.2/configure squid-3.3.3/configure
--- squid-3.3.2/configure 2013-03-02 15:38:12.000000000 +1300
+++ squid-3.3.3/configure 2013-03-12 23:18:22.000000000 +1300
@@ -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.3.2.
+# Generated by GNU Autoconf 2.68 for Squid Web Proxy 3.3.3.
#
# Report bugs to .
#
@@ -575,8 +575,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='3.3.2'
-PACKAGE_STRING='Squid Web Proxy 3.3.2'
+PACKAGE_VERSION='3.3.3'
+PACKAGE_STRING='Squid Web Proxy 3.3.3'
PACKAGE_BUGREPORT='http://bugs.squid-cache.org/'
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.3.2 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 3.3.3 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.3.2:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 3.3.3:";;
esac
cat <<\_ACEOF
@@ -2014,7 +2014,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 3.3.2
+Squid Web Proxy configure 3.3.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3110,7 +3110,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.3.2, which was
+It was created by Squid Web Proxy $as_me 3.3.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3929,7 +3929,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='3.3.2'
+ VERSION='3.3.3'
cat >>confdefs.h <<_ACEOF
@@ -31319,7 +31319,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.3.2, which was
+This file was extended by Squid Web Proxy $as_me 3.3.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -31385,7 +31385,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.3.2
+Squid Web Proxy config.status 3.3.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -u -r -N squid-3.3.2/configure.ac squid-3.3.3/configure.ac
--- squid-3.3.2/configure.ac 2013-03-02 15:38:12.000000000 +1300
+++ squid-3.3.3/configure.ac 2013-03-12 23:18:22.000000000 +1300
@@ -1,4 +1,4 @@
-AC_INIT([Squid Web Proxy],[3.3.2],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[3.3.3],[http://bugs.squid-cache.org/],[squid])
AC_PREREQ(2.61)
AC_CONFIG_HEADERS([include/autoconf.h])
AC_CONFIG_AUX_DIR(cfgaux)
diff -u -r -N squid-3.3.2/helpers/basic_auth/DB/basic_db_auth.8 squid-3.3.3/helpers/basic_auth/DB/basic_db_auth.8
--- squid-3.3.2/helpers/basic_auth/DB/basic_db_auth.8 2013-03-02 16:01:15.000000000 +1300
+++ squid-3.3.3/helpers/basic_auth/DB/basic_db_auth.8 2013-03-12 23:47:08.000000000 +1300
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "BASIC_DB_AUTH 1"
-.TH BASIC_DB_AUTH 1 "2013-03-01" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH BASIC_DB_AUTH 1 "2013-03-12" "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.3.2/helpers/external_acl/SQL_session/ext_sql_session_acl.8 squid-3.3.3/helpers/external_acl/SQL_session/ext_sql_session_acl.8
--- squid-3.3.2/helpers/external_acl/SQL_session/ext_sql_session_acl.8 2013-03-02 16:01:20.000000000 +1300
+++ squid-3.3.3/helpers/external_acl/SQL_session/ext_sql_session_acl.8 2013-03-12 23:47:16.000000000 +1300
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_SQL_SESSION_ACL 1"
-.TH EXT_SQL_SESSION_ACL 1 "2013-03-01" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH EXT_SQL_SESSION_ACL 1 "2013-03-12" "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.3.2/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 squid-3.3.3/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8
--- squid-3.3.2/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2013-03-02 16:01:20.000000000 +1300
+++ squid-3.3.3/helpers/external_acl/wbinfo_group/ext_wbinfo_group_acl.8 2013-03-12 23:47:17.000000000 +1300
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_WBINFO_GROUP_ACL.PL.IN 1"
-.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2013-03-01" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH EXT_WBINFO_GROUP_ACL.PL.IN 1 "2013-03-12" "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.3.2/helpers/log_daemon/DB/log_db_daemon.8 squid-3.3.3/helpers/log_daemon/DB/log_db_daemon.8
--- squid-3.3.2/helpers/log_daemon/DB/log_db_daemon.8 2013-03-02 16:01:21.000000000 +1300
+++ squid-3.3.3/helpers/log_daemon/DB/log_db_daemon.8 2013-03-12 23:47:18.000000000 +1300
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "LOG_DB_DAEMON 1"
-.TH LOG_DB_DAEMON 1 "2013-03-01" "perl v5.10.1" "User Contributed Perl Documentation"
+.TH LOG_DB_DAEMON 1 "2013-03-12" "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.3.2/include/version.h squid-3.3.3/include/version.h
--- squid-3.3.2/include/version.h 2013-03-02 15:38:13.000000000 +1300
+++ squid-3.3.3/include/version.h 2013-03-12 23:18:22.000000000 +1300
@@ -7,7 +7,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1362191814
+#define SQUID_RELEASE_TIME 1363083425
#endif
#ifndef APP_SHORTNAME
diff -u -r -N squid-3.3.2/RELEASENOTES.html squid-3.3.3/RELEASENOTES.html
--- squid-3.3.2/RELEASENOTES.html 2013-03-02 16:01:40.000000000 +1300
+++ squid-3.3.3/RELEASENOTES.html 2013-03-12 23:47:40.000000000 +1300
@@ -2,10 +2,10 @@
- Squid 3.3.1 release notes
+ Squid 3.3.3 release notes
-Squid 3.3.1 release notes
+Squid 3.3.3 release notes
Squid Developers
@@ -56,11 +56,14 @@
-The Squid Team are pleased to announce the release of Squid-3.3.1 for testing.
+The Squid Team are pleased to announce the release of Squid-3.3.3.
This new release is available for download from
http://www.squid-cache.org/Versions/v3/3.3/ or the
mirrors.
-While this release is not deemed ready for production use, we believe it is ready for wider testing by the community.
+
+A large number of the design flaws in SSL-Bump feature have been fixed along with general improvements all around.
+While this release is not fully bug-free we believe it is ready for use in production on many systems.
+
We welcome feedback and bug reports. If you find a bug, please see
http://wiki.squid-cache.org/SquidFaq/BugReporting
for how to submit a report with a stack trace.
diff -u -r -N squid-3.3.2/src/comm/ModDevPoll.cc squid-3.3.3/src/comm/ModDevPoll.cc
--- squid-3.3.2/src/comm/ModDevPoll.cc 2013-03-02 15:36:58.000000000 +1300
+++ squid-3.3.3/src/comm/ModDevPoll.cc 2013-03-12 23:17:07.000000000 +1300
@@ -53,6 +53,7 @@
#if USE_DEVPOLL
#include "comm/Loops.h"
+#include "fd.h"
#include "fde.h"
#include "mgr/Registration.h"
#include "profiler/Profiler.h"
@@ -68,10 +69,13 @@
#if HAVE_ERRNO_H
#include
#endif
+#if HAVE_LIMITS_H
+#include
+#endif
#define DEBUG_DEVPOLL 0
-/* OPEN_MAX is defined in , presumably included by sys/devpoll.h */
+// OPEN_MAX is defined in
#define DEVPOLL_UPDATESIZE OPEN_MAX
#define DEVPOLL_QUERYSIZE OPEN_MAX
diff -u -r -N squid-3.3.2/src/errorpage.cc squid-3.3.3/src/errorpage.cc
--- squid-3.3.2/src/errorpage.cc 2013-03-02 15:36:58.000000000 +1300
+++ squid-3.3.3/src/errorpage.cc 2013-03-12 23:17:07.000000000 +1300
@@ -381,17 +381,9 @@
while (pos < hdr.size()) {
char *dt = lang;
- if (!pos) {
- /* skip any initial whitespace. */
- while (pos < hdr.size() && xisspace(hdr[pos]))
- ++pos;
- } else {
- // IFF we terminated the tag on whitespace or ';' we need to skip to the next ',' or end of header.
- while (pos < hdr.size() && hdr[pos] != ',')
- ++pos;
- if (hdr[pos] == ',')
- ++pos;
- }
+ /* skip any initial whitespace. */
+ while (pos < hdr.size() && xisspace(hdr[pos]))
+ ++pos;
/*
* Header value format:
@@ -422,6 +414,13 @@
*dt = '\0'; // nul-terminated the filename content string before system use.
++dt;
+ // if we terminated the tag on garbage or ';' we need to skip to the next ',' or end of header.
+ while (pos < hdr.size() && hdr[pos] != ',')
+ ++pos;
+
+ if (pos < hdr.size() && hdr[pos] == ',')
+ ++pos;
+
debugs(4, 9, HERE << "STATE: dt='" << dt << "', lang='" << lang << "', pos=" << pos << ", buf='" << ((pos < hdr.size()) ? hdr.substr(pos,hdr.size()) : "") << "'");
/* if we found anything we might use, try it. */
diff -u -r -N squid-3.3.2/src/errorpage.h squid-3.3.3/src/errorpage.h
--- squid-3.3.2/src/errorpage.h 2013-03-02 15:36:58.000000000 +1300
+++ squid-3.3.3/src/errorpage.h 2013-03-12 23:17:07.000000000 +1300
@@ -315,11 +315,16 @@
/**
* Parses the Accept-Language header value and return one language item on
* each call.
+ * Will ignore any whitespace, q-values, and detectably invalid language
+ * codes in the header.
+ *
* \param hdr is the Accept-Language header value
- * \param lang a buffer given by the user to store parsed language
+ * \param lang a buffer to store parsed language code in
* \param langlen the length of the lang buffer
- * \param pos it is used to store the state of parsing. Must be "0" on first call
- * \return true on success, false otherwise
+ * \param pos is used to store the offset state of parsing. Must be "0" on first call.
+ * Will be altered to point at the start of next field-value.
+ * \return true if something looking like a language token has been placed in lang, false otherwise
*/
bool strHdrAcptLangGetItem(const String &hdr, char *lang, int langLen, size_t &pos);
+
#endif /* SQUID_ERRORPAGE_H */
diff -u -r -N squid-3.3.2/src/peer_digest.cc squid-3.3.3/src/peer_digest.cc
--- squid-3.3.2/src/peer_digest.cc 2013-03-02 15:36:58.000000000 +1300
+++ squid-3.3.3/src/peer_digest.cc 2013-03-12 23:17:07.000000000 +1300
@@ -347,9 +347,14 @@
req->header.putStr(HDR_ACCEPT, "text/html");
- if (p->login)
+ if (p->login &&
+ p->login[0] != '*' &&
+ strcmp(p->login, "PASS") != 0 &&
+ strcmp(p->login, "PASSTHRU") != 0 &&
+ strcmp(p->login, "NEGOTIATE") != 0 &&
+ strcmp(p->login, "PROXYPASS") != 0) {
xstrncpy(req->login, p->login, MAX_LOGIN_SZ);
-
+ }
/* create fetch state structure */
CBDATA_INIT_TYPE(DigestFetchState);
diff -u -r -N squid-3.3.2/src/peer_select.cc squid-3.3.3/src/peer_select.cc
--- squid-3.3.2/src/peer_select.cc 2013-03-02 15:36:58.000000000 +1300
+++ squid-3.3.3/src/peer_select.cc 2013-03-12 23:17:07.000000000 +1300
@@ -55,6 +55,7 @@
#include "SquidConfig.h"
#include "SquidTime.h"
#include "Store.h"
+#include "URL.h"
static struct {
int timeouts;
@@ -285,15 +286,10 @@
PSC *callback = psstate->callback;
psstate->callback = NULL;
- if (psstate->paths->size() < 1) {
- debugs(44, DBG_IMPORTANT, "Failed to select source for '" << psstate->entry->url() << "'");
- debugs(44, DBG_IMPORTANT, " always_direct = " << psstate->always_direct);
- debugs(44, DBG_IMPORTANT, " never_direct = " << psstate->never_direct);
- debugs(44, DBG_IMPORTANT, " timedout = " << psstate->ping.timedout);
- } else {
- debugs(44, 2, "Found sources for '" << psstate->entry->url() << "'");
- debugs(44, 2, " always_direct = " << psstate->always_direct);
- debugs(44, 2, " never_direct = " << psstate->never_direct);
+ debugs(44, 2, (psstate->paths->size()<1?"Failed to select source":"Found sources") << " for '" << psstate->url() << "'");
+ debugs(44, 2, " always_direct = " << psstate->always_direct);
+ debugs(44, 2, " never_direct = " << psstate->never_direct);
+ if (psstate->paths) {
for (size_t i = 0; i < psstate->paths->size(); ++i) {
if ((*psstate->paths)[i]->peerType == HIER_DIRECT)
debugs(44, 2, " DIRECT = " << (*psstate->paths)[i]);
@@ -304,8 +300,8 @@
else
debugs(44, 2, " cache_peer = " << (*psstate->paths)[i]);
}
- debugs(44, 2, " timedout = " << psstate->ping.timedout);
}
+ debugs(44, 2, " timedout = " << psstate->ping.timedout);
psstate->ping.stop = current_time;
psstate->request->hier.ping = psstate->ping;
@@ -971,6 +967,18 @@
; // no local defaults.
}
+const char *
+ps_state::url() const
+{
+ if (entry)
+ return entry->url();
+
+ if (request)
+ return urlCanonical(request);
+
+ return "[no URL]";
+}
+
ping_data::ping_data() :
n_sent(0),
n_recv(0),
diff -u -r -N squid-3.3.2/src/PeerSelectState.h squid-3.3.3/src/PeerSelectState.h
--- squid-3.3.2/src/PeerSelectState.h 2013-03-02 15:36:58.000000000 +1300
+++ squid-3.3.3/src/PeerSelectState.h 2013-03-12 23:17:07.000000000 +1300
@@ -73,6 +73,11 @@
public:
void *operator new(size_t);
ps_state();
+
+ // Produce a URL for display identifying the transaction we are
+ // trying to locate a peer for.
+ const char * url() const;
+
HttpRequest *request;
StoreEntry *entry;
allow_t always_direct;
diff -u -r -N squid-3.3.2/src/store_dir.cc squid-3.3.3/src/store_dir.cc
--- squid-3.3.2/src/store_dir.cc 2013-03-02 15:36:58.000000000 +1300
+++ squid-3.3.3/src/store_dir.cc 2013-03-12 23:17:07.000000000 +1300
@@ -56,6 +56,9 @@
#if HAVE_SYS_PARAM_H
#include
#endif
+#if HAVE_LIMITS_H
+#include
+#endif
#if HAVE_SYS_MOUNT_H
#include
#endif