diff -u -r -N squid-5.0.6/ChangeLog squid-5.0.7/ChangeLog
--- squid-5.0.6/ChangeLog 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/ChangeLog 2021-07-05 20:27:18.000000000 +1200
@@ -1,3 +1,10 @@
+Changes in squid-5.0.7 (04 Jul 2021):
+
+ - Fix a helper logging issues
+ - Fix some helper connection issues
+ - Cleanup: remove much unused code
+ - ... and all fixes from 4.16
+
Changes in squid-5.0.6 (10 May 2021):
- Bug 5057: Generated response lacks status code
@@ -105,6 +112,13 @@
- ... and much code cleanup and polishing
- ... and all fixes from 4.10
+Changes in squid-4.16 (04 Jul 2021):
+
+ - Regression Fix: --with-valgrind-debug build broken since 4.15
+ - Bug 5129 pt1: remove Lock use from HttpRequestMethod
+ - Bug 5128: Translation: Fix '% i' typo in es/ERR_FORWARDING_DENIED
+ - Bug 4528: ICAP transactions quit on async DNS lookups
+
Changes in squid-4.15 (10 May 2021):
- Bug 5112: Excessively loud chunked reply parsing error reporting
diff -u -r -N squid-5.0.6/compat/GnuRegex.c squid-5.0.7/compat/GnuRegex.c
--- squid-5.0.6/compat/GnuRegex.c 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/compat/GnuRegex.c 2021-07-05 20:27:18.000000000 +1200
@@ -2757,7 +2757,7 @@
wordchar_p(const char *d, const char *end1, const char *string2)
{
return re_syntax_table[(d) == end1 ? *string2
- : (d) == string2 - 1 ? *(end1 - 1) : *(d)]
+ : (d) == string2 - 1 ? *(end1 - 1) : *(d)]
== Sword;
}
diff -u -r -N squid-5.0.6/configure squid-5.0.7/configure
--- squid-5.0.6/configure 2021-05-10 22:57:57.000000000 +1200
+++ squid-5.0.7/configure 2021-07-05 22:41:19.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.69 for Squid Web Proxy 5.0.6.
+# Generated by GNU Autoconf 2.69 for Squid Web Proxy 5.0.7.
#
# Report bugs to .
#
@@ -595,8 +595,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='5.0.6'
-PACKAGE_STRING='Squid Web Proxy 5.0.6'
+PACKAGE_VERSION='5.0.7'
+PACKAGE_STRING='Squid Web Proxy 5.0.7'
PACKAGE_BUGREPORT='http://bugs.squid-cache.org/'
PACKAGE_URL=''
@@ -1662,7 +1662,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 5.0.6 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 5.0.7 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 5.0.6:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 5.0.7:";;
esac
cat <<\_ACEOF
@@ -2166,7 +2166,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 5.0.6
+Squid Web Proxy configure 5.0.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3270,7 +3270,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 5.0.6, which was
+It was created by Squid Web Proxy $as_me 5.0.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4132,7 +4132,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='5.0.6'
+ VERSION='5.0.7'
cat >>confdefs.h <<_ACEOF
@@ -45093,7 +45093,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 5.0.6, which was
+This file was extended by Squid Web Proxy $as_me 5.0.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -45159,7 +45159,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 5.0.6
+Squid Web Proxy config.status 5.0.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -u -r -N squid-5.0.6/configure.ac squid-5.0.7/configure.ac
--- squid-5.0.6/configure.ac 2021-05-10 22:57:57.000000000 +1200
+++ squid-5.0.7/configure.ac 2021-07-05 22:41:19.000000000 +1200
@@ -5,7 +5,7 @@
## Please see the COPYING and CONTRIBUTORS files for details.
##
-AC_INIT([Squid Web Proxy],[5.0.6],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[5.0.7],[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-5.0.6/doc/release-notes/release-5.html squid-5.0.7/doc/release-notes/release-5.html
--- squid-5.0.6/doc/release-notes/release-5.html 2021-05-10 23:02:18.000000000 +1200
+++ squid-5.0.7/doc/release-notes/release-5.html 2021-07-05 22:45:43.000000000 +1200
@@ -3,10 +3,10 @@
- Squid 5.0.6 release notes
+ Squid 5.0.7 release notes
-Squid 5.0.6 release notes
+Squid 5.0.7 release notes
Squid Developers
@@ -61,7 +61,7 @@
-The Squid Team are pleased to announce the release of Squid-5.0.6 for testing.
+The Squid Team are pleased to announce the release of Squid-5.0.7 for testing.
This new release is available for download from
http://www.squid-cache.org/Versions/v5/ or the
mirrors.
@@ -265,6 +265,11 @@
primary to-server connection and opening a spare to-server
connection for the same transaction.
+http_upgrade_request_protocols
+New directive to control client-initiated and server-confirmed
+switching from HTTP to another protocol using HTTP/1.1 Upgrade
+mechanism.
+
mark_client_connection
New access control to apply a Netfilter CONNMARK value to a TCP client
connection.
@@ -323,7 +328,7 @@
Now disabled when --disable-auth build parameter is used.
deny_info
-New code %A to display Squid listening IP address the client
+
New code A to display Squid listening IP address the client
TCP connection was connected to.
http_port
@@ -331,6 +336,8 @@
listening queue for each worker in SMP.
https_port
+New worker-queues option to have TCP stack maintain dedicated
+listening queue for each worker in SMP.
New CONDITIONAL_AUTH flag for sslflags= option to
request client certificate(s) but not reject clients without any.
diff -u -r -N squid-5.0.6/errors/es/ERR_FORWARDING_DENIED squid-5.0.7/errors/es/ERR_FORWARDING_DENIED
--- squid-5.0.6/errors/es/ERR_FORWARDING_DENIED 2021-05-10 22:59:29.000000000 +1200
+++ squid-5.0.7/errors/es/ERR_FORWARDING_DENIED 2021-07-05 22:42:47.000000000 +1200
@@ -24,7 +24,7 @@
Reenvío denegado.
-Este caché no transmitirá su solicitud, ya que intenta imponer una relación de conexión. Quizás el cliente en% i es un caché que se ha desconfigurado.
+Este caché no transmitirá su solicitud, ya que intenta imponer una relación de conexión. Quizás el cliente en %i es un caché que se ha desconfigurado.
Su administrador del caché es %w.
diff -u -r -N squid-5.0.6/include/version.h squid-5.0.7/include/version.h
--- squid-5.0.6/include/version.h 2021-05-10 22:57:57.000000000 +1200
+++ squid-5.0.7/include/version.h 2021-07-05 22:41:19.000000000 +1200
@@ -7,7 +7,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1620644267
+#define SQUID_RELEASE_TIME 1625481669
#endif
/*
diff -u -r -N squid-5.0.6/lib/base64.c squid-5.0.7/lib/base64.c
--- squid-5.0.6/lib/base64.c 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/lib/base64.c 2021-07-05 20:27:18.000000000 +1200
@@ -57,22 +57,22 @@
{
/* White space is HT, VT, FF, CR, LF and SPC */
-1, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2, -2, -2, -2, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -3, -1, -1,
- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
- -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- };
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -3, -1, -1,
+ -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+ -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ };
ctx->word = ctx->bits = ctx->padding = 0;
ctx->table = base64_decode_table;
diff -u -r -N squid-5.0.6/lib/smblib/smblib-util.c squid-5.0.7/lib/smblib/smblib-util.c
--- squid-5.0.6/lib/smblib/smblib-util.c 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/lib/smblib/smblib-util.c 2021-07-05 20:27:18.000000000 +1200
@@ -52,7 +52,7 @@
SMB_P_NT1,
SMB_P_NT1,
-1
- };
+ };
#if UNDEFINED
char *SMB_DOSTimToStr(int DOS_time);
diff -u -r -N squid-5.0.6/RELEASENOTES.html squid-5.0.7/RELEASENOTES.html
--- squid-5.0.6/RELEASENOTES.html 2021-05-10 23:02:18.000000000 +1200
+++ squid-5.0.7/RELEASENOTES.html 2021-07-05 22:45:43.000000000 +1200
@@ -3,10 +3,10 @@
- Squid 5.0.6 release notes
+ Squid 5.0.7 release notes
-Squid 5.0.6 release notes
+Squid 5.0.7 release notes
Squid Developers
@@ -61,7 +61,7 @@
-The Squid Team are pleased to announce the release of Squid-5.0.6 for testing.
+The Squid Team are pleased to announce the release of Squid-5.0.7 for testing.
This new release is available for download from
http://www.squid-cache.org/Versions/v5/ or the
mirrors.
@@ -265,6 +265,11 @@
primary to-server connection and opening a spare to-server
connection for the same transaction.
+http_upgrade_request_protocols
+New directive to control client-initiated and server-confirmed
+switching from HTTP to another protocol using HTTP/1.1 Upgrade
+mechanism.
+
mark_client_connection
New access control to apply a Netfilter CONNMARK value to a TCP client
connection.
@@ -323,7 +328,7 @@
Now disabled when --disable-auth build parameter is used.
deny_info
-New code %A to display Squid listening IP address the client
+
New code A to display Squid listening IP address the client
TCP connection was connected to.
http_port
@@ -331,6 +336,8 @@
listening queue for each worker in SMP.
https_port
+New worker-queues option to have TCP stack maintain dedicated
+listening queue for each worker in SMP.
New CONDITIONAL_AUTH flag for sslflags= option to
request client certificate(s) but not reject clients without any.
diff -u -r -N squid-5.0.6/src/acl/external/delayer/ext_delayer_acl.8 squid-5.0.7/src/acl/external/delayer/ext_delayer_acl.8
--- squid-5.0.6/src/acl/external/delayer/ext_delayer_acl.8 2021-05-10 23:02:22.000000000 +1200
+++ squid-5.0.7/src/acl/external/delayer/ext_delayer_acl.8 2021-07-05 22:45:46.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_DELAYER_ACL 8"
-.TH EXT_DELAYER_ACL 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH EXT_DELAYER_ACL 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/src/acl/external/kerberos_ldap_group/support.h squid-5.0.7/src/acl/external/kerberos_ldap_group/support.h
--- squid-5.0.6/src/acl/external/kerberos_ldap_group/support.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/acl/external/kerberos_ldap_group/support.h 2021-07-05 20:27:18.000000000 +1200
@@ -127,11 +127,11 @@
#define error(X...) \
fprintf(stderr, "%s(%d): pid=%ld :", __FILE__, __LINE__, (long)getpid() ); \
fprintf(stderr,X); \
-
+
#define warn(X...) \
fprintf(stderr, "%s(%d): pid=%ld :", __FILE__, __LINE__, (long)getpid() ); \
fprintf(stderr,X); \
-
+
#else /* __GNUC__ */
/* non-GCC compilers can't do the above macro define yet. */
diff -u -r -N squid-5.0.6/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 squid-5.0.7/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8
--- squid-5.0.6/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 2021-05-10 23:02:22.000000000 +1200
+++ squid-5.0.7/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.8 2021-07-05 22:45:46.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_KERBEROS_SID_GROUP_ACL 8"
-.TH EXT_KERBEROS_SID_GROUP_ACL 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH EXT_KERBEROS_SID_GROUP_ACL 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/src/acl/external/SQL_session/ext_sql_session_acl.8 squid-5.0.7/src/acl/external/SQL_session/ext_sql_session_acl.8
--- squid-5.0.6/src/acl/external/SQL_session/ext_sql_session_acl.8 2021-05-10 23:02:22.000000000 +1200
+++ squid-5.0.7/src/acl/external/SQL_session/ext_sql_session_acl.8 2021-07-05 22:45:46.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_SQL_SESSION_ACL 8"
-.TH EXT_SQL_SESSION_ACL 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH EXT_SQL_SESSION_ACL 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 squid-5.0.7/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8
--- squid-5.0.6/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2021-05-10 23:02:22.000000000 +1200
+++ squid-5.0.7/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2021-07-05 22:45:46.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "EXT_WBINFO_GROUP_ACL 8"
-.TH EXT_WBINFO_GROUP_ACL 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH EXT_WBINFO_GROUP_ACL 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/src/adaptation/ecap/ServiceRep.cc squid-5.0.7/src/adaptation/ecap/ServiceRep.cc
--- squid-5.0.6/src/adaptation/ecap/ServiceRep.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/adaptation/ecap/ServiceRep.cc 2021-07-05 20:27:18.000000000 +1200
@@ -152,7 +152,7 @@
/* Adaptation::Ecap::ServiceRep */
Adaptation::Ecap::ServiceRep::ServiceRep(const ServiceConfigPointer &cfg):
-/*AsyncJob("Adaptation::Ecap::ServiceRep"),*/ Adaptation::Service(cfg),
+ /*AsyncJob("Adaptation::Ecap::ServiceRep"),*/ Adaptation::Service(cfg),
isDetached(false)
{
}
diff -u -r -N squid-5.0.6/src/adaptation/icap/Xaction.cc squid-5.0.7/src/adaptation/icap/Xaction.cc
--- squid-5.0.6/src/adaptation/icap/Xaction.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/adaptation/icap/Xaction.cc 2021-07-05 20:27:18.000000000 +1200
@@ -86,6 +86,7 @@
isRetriable(true),
isRepeatable(true),
ignoreLastWrite(false),
+ waitingForDns(false),
stopReason(NULL),
connector(NULL),
reader(NULL),
@@ -187,12 +188,17 @@
debugs(93,3, typeName << " opens connection to " << s.cfg().host.termedBuf() << ":" << s.cfg().port);
// Locate the Service IP(s) to open
+ assert(!waitingForDns);
+ waitingForDns = true; // before the possibly-synchronous ipcache_nbgethostbyname()
ipcache_nbgethostbyname(s.cfg().host.termedBuf(), icapLookupDnsResults, this);
}
void
Adaptation::Icap::Xaction::dnsLookupDone(const ipcache_addrs *ia)
{
+ assert(waitingForDns);
+ waitingForDns = false;
+
Adaptation::Icap::ServiceRep &s = service();
if (ia == NULL) {
@@ -418,7 +424,8 @@
bool Adaptation::Icap::Xaction::doneAll() const
{
- return !connector && !securer && !reader && !writer && Adaptation::Initiate::doneAll();
+ return !waitingForDns && !connector && !securer && !reader && !writer &&
+ Adaptation::Initiate::doneAll();
}
void Adaptation::Icap::Xaction::updateTimeout()
@@ -690,6 +697,9 @@
buf.append(";", 1);
}
+
+ if (waitingForDns)
+ buf.append("D", 1);
}
void Adaptation::Icap::Xaction::fillDoneStatus(MemBuf &buf) const
diff -u -r -N squid-5.0.6/src/adaptation/icap/Xaction.h squid-5.0.7/src/adaptation/icap/Xaction.h
--- squid-5.0.6/src/adaptation/icap/Xaction.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/adaptation/icap/Xaction.h 2021-07-05 20:27:18.000000000 +1200
@@ -137,6 +137,7 @@
bool isRetriable; ///< can retry on persistent connection failures
bool isRepeatable; ///< can repeat if no or unsatisfactory response
bool ignoreLastWrite;
+ bool waitingForDns; ///< expecting a ipcache_nbgethostbyname() callback
const char *stopReason;
diff -u -r -N squid-5.0.6/src/auth/basic/DB/basic_db_auth.8 squid-5.0.7/src/auth/basic/DB/basic_db_auth.8
--- squid-5.0.6/src/auth/basic/DB/basic_db_auth.8 2021-05-10 23:02:23.000000000 +1200
+++ squid-5.0.7/src/auth/basic/DB/basic_db_auth.8 2021-07-05 22:45:47.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "BASIC_DB_AUTH 8"
-.TH BASIC_DB_AUTH 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH BASIC_DB_AUTH 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/src/auth/basic/POP3/basic_pop3_auth.8 squid-5.0.7/src/auth/basic/POP3/basic_pop3_auth.8
--- squid-5.0.6/src/auth/basic/POP3/basic_pop3_auth.8 2021-05-10 23:02:23.000000000 +1200
+++ squid-5.0.7/src/auth/basic/POP3/basic_pop3_auth.8 2021-07-05 22:45:47.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "BASIC_POP3_AUTH 8"
-.TH BASIC_POP3_AUTH 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH BASIC_POP3_AUTH 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/src/auth/Config.h squid-5.0.7/src/auth/Config.h
--- squid-5.0.6/src/auth/Config.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/auth/Config.h 2021-07-05 20:27:18.000000000 +1200
@@ -20,13 +20,10 @@
class Config
{
- explicit Config(const Config &) = delete;
- explicit Config(const Config *) = delete;
-
public:
Config() = default;
- explicit Config(Config &&) = default;
- ~Config() { assert(!schemeAccess); }
+ Config(Config &&) = delete; // no support for copying of any kind
+ ~Config() = default;
/// set of auth_params directives
Auth::ConfigVector schemes;
diff -u -r -N squid-5.0.6/src/base/TypeTraits.h squid-5.0.7/src/base/TypeTraits.h
--- squid-5.0.6/src/base/TypeTraits.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/base/TypeTraits.h 2021-07-05 20:27:18.000000000 +1200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
diff -u -r -N squid-5.0.6/src/cache_manager.cc squid-5.0.7/src/cache_manager.cc
--- squid-5.0.6/src/cache_manager.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/cache_manager.cc 2021-07-05 20:27:18.000000000 +1200
@@ -14,8 +14,8 @@
#include "CacheManager.h"
#include "comm/Connection.h"
#include "Debug.h"
-#include "errorpage.h"
#include "error/ExceptionErrorDetail.h"
+#include "errorpage.h"
#include "fde.h"
#include "HttpReply.h"
#include "HttpRequest.h"
diff -u -r -N squid-5.0.6/src/cbdata.cc squid-5.0.7/src/cbdata.cc
--- squid-5.0.6/src/cbdata.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/cbdata.cc 2021-07-05 20:27:18.000000000 +1200
@@ -90,14 +90,7 @@
{}
~cbdata();
- static cbdata *FromUserData(const void *p) {
-#if WITH_VALGRIND
- return cbdata_htable.at(p);
-#else
- const auto t = static_cast(p) - offsetof(cbdata, data);
- return reinterpret_cast(const_cast(t));
-#endif
- }
+ static cbdata *FromUserData(const void *);
int valid;
int32_t locks;
@@ -168,6 +161,16 @@
cbdata_index[type].pool->freeOne(p);
}
+cbdata *
+cbdata::FromUserData(const void *p) {
+#if WITH_VALGRIND
+ return cbdata_htable.at(p);
+#else
+ const auto t = static_cast(p) - offsetof(cbdata, data);
+ return reinterpret_cast(const_cast(t));
+#endif
+}
+
static void
cbdataInternalInitType(cbdata_type type, const char *name, int size)
{
diff -u -r -N squid-5.0.6/src/clients/FtpClient.cc squid-5.0.7/src/clients/FtpClient.cc
--- squid-5.0.6/src/clients/FtpClient.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/clients/FtpClient.cc 2021-07-05 20:27:18.000000000 +1200
@@ -181,12 +181,12 @@
Ftp::Client::Client(FwdState *fwdState):
AsyncJob("Ftp::Client"),
::Client(fwdState),
- ctrl(),
- data(),
- state(BEGIN),
- old_request(NULL),
- old_reply(NULL),
- shortenReadTimeout(false)
+ ctrl(),
+ data(),
+ state(BEGIN),
+ old_request(NULL),
+ old_reply(NULL),
+ shortenReadTimeout(false)
{
++statCounter.server.all.requests;
++statCounter.server.ftp.requests;
diff -u -r -N squid-5.0.6/src/comm.cc squid-5.0.7/src/comm.cc
--- squid-5.0.6/src/comm.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/comm.cc 2021-07-05 20:27:18.000000000 +1200
@@ -1297,8 +1297,8 @@
const auto ccb = COMMIO_FD_WRITECB(head);
// check that the head descriptor is still relevant
if (headFde.clientInfo == this &&
- quotaPeekReserv() == ccb->quotaQueueReserv &&
- !headFde.closing()) {
+ quotaPeekReserv() == ccb->quotaQueueReserv &&
+ !headFde.closing()) {
// wait for the head descriptor to become ready for writing
Comm::SetSelect(head, COMM_SELECT_WRITE, Comm::HandleWrite, ccb, 0);
@@ -1679,7 +1679,7 @@
if (!fd_table[c->fd].halfClosedReader) { // not reading already
CallBack(fd_table[c->fd].codeContext, [&c] {
AsyncCall::Pointer call = commCbCall(5,4, "commHalfClosedReader",
- CommIoCbPtrFun(&commHalfClosedReader, nullptr));
+ CommIoCbPtrFun(&commHalfClosedReader, nullptr));
Comm::Read(c, call);
fd_table[c->fd].halfClosedReader = call;
});
diff -u -r -N squid-5.0.6/src/DiskIO/IpcIo/IpcIoFile.cc squid-5.0.7/src/DiskIO/IpcIo/IpcIoFile.cc
--- squid-5.0.6/src/DiskIO/IpcIo/IpcIoFile.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/DiskIO/IpcIo/IpcIoFile.cc 2021-07-05 20:27:18.000000000 +1200
@@ -585,7 +585,7 @@
CallService(nullptr, [&] {
// we check all older requests at once so some may be wait for 2*Timeout
eventAdd("IpcIoFile::CheckTimeouts", &IpcIoFile::CheckTimeouts,
- reinterpret_cast(diskId), Timeout, 0, false);
+ reinterpret_cast(diskId), Timeout, 0, false);
timeoutCheckScheduled = true;
});
}
diff -u -r -N squid-5.0.6/src/dns_internal.cc squid-5.0.7/src/dns_internal.cc
--- squid-5.0.6/src/dns_internal.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/dns_internal.cc 2021-07-05 20:27:18.000000000 +1200
@@ -1125,7 +1125,7 @@
for (auto looker = master; looker; looker = looker->queue) {
CallBack(looker->codeContext, [&] {
(void)idnsCallbackOneWithAnswer(looker->callback, looker->callback_data,
- *answered, lastAnswer);
+ *answered, lastAnswer);
});
}
}
diff -u -r -N squid-5.0.6/src/external_acl.cc squid-5.0.7/src/external_acl.cc
--- squid-5.0.6/src/external_acl.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/external_acl.cc 2021-07-05 20:27:18.000000000 +1200
@@ -1115,7 +1115,7 @@
p->cache = hash_create((HASHCMP *) strcmp, hashPrime(1024), hash4);
if (!p->theHelper)
- p->theHelper = new helper(p->name);
+ p->theHelper = new helper("external_acl_type");
p->theHelper->cmdline = p->cmdline;
diff -u -r -N squid-5.0.6/src/fs/rock/RockIoRequests.cc squid-5.0.7/src/fs/rock/RockIoRequests.cc
--- squid-5.0.6/src/fs/rock/RockIoRequests.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/fs/rock/RockIoRequests.cc 2021-07-05 20:27:18.000000000 +1200
@@ -16,18 +16,18 @@
Rock::ReadRequest::ReadRequest(const ::ReadRequest &base, const IoState::Pointer &anSio, const IoXactionId anId):
::ReadRequest(base),
- sio(anSio),
- id(anId)
+ sio(anSio),
+ id(anId)
{
}
Rock::WriteRequest::WriteRequest(const ::WriteRequest &base, const IoState::Pointer &anSio, const IoXactionId anId):
::WriteRequest(base),
- sio(anSio),
- sidPrevious(-1),
- sidCurrent(-1),
- id(anId),
- eof(false)
+ sio(anSio),
+ sidPrevious(-1),
+ sidCurrent(-1),
+ id(anId),
+ eof(false)
{
}
diff -u -r -N squid-5.0.6/src/helper.cc squid-5.0.7/src/helper.cc
--- squid-5.0.6/src/helper.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/helper.cc 2021-07-05 20:27:18.000000000 +1200
@@ -967,8 +967,7 @@
if (!srv->flags.shutdown) {
helperKickQueue(hlp);
} else if (!srv->flags.closing && !srv->stats.pending) {
- srv->flags.closing=true;
- srv->writePipe->close();
+ srv->closeWritePipeSafely(srv->parent->id_name);
}
}
diff -u -r -N squid-5.0.6/src/helper.h squid-5.0.7/src/helper.h
--- squid-5.0.6/src/helper.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/helper.h 2021-07-05 20:27:18.000000000 +1200
@@ -65,6 +65,7 @@
CBDATA_CLASS(helper);
public:
+ /// \param name admin-visible helper category (with this process lifetime)
inline helper(const char *name) :
cmdline(NULL),
id_name(name),
diff -u -r -N squid-5.0.6/src/http/forward.h squid-5.0.7/src/http/forward.h
--- squid-5.0.6/src/http/forward.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/http/forward.h 2021-07-05 20:27:18.000000000 +1200
@@ -26,7 +26,6 @@
// TODO move these classes into Http namespace
class HttpRequestMethod;
-typedef RefCount HttpRequestMethodPointer;
class HttpRequest;
typedef RefCount HttpRequestPointer;
diff -u -r -N squid-5.0.6/src/http/RegisteredHeadersHash.cci squid-5.0.7/src/http/RegisteredHeadersHash.cci
--- squid-5.0.6/src/http/RegisteredHeadersHash.cci 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/http/RegisteredHeadersHash.cci 2021-07-05 20:27:18.000000000 +1200
@@ -366,7 +366,7 @@
};
const class HeaderTableRecord *
-HttpHeaderHashTable::lookup (const char *str, size_t len)
+ HttpHeaderHashTable::lookup (const char *str, size_t len)
{
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
diff -u -r -N squid-5.0.6/src/http/RequestMethod.h squid-5.0.7/src/http/RequestMethod.h
--- squid-5.0.6/src/http/RequestMethod.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/http/RequestMethod.h 2021-07-05 20:27:18.000000000 +1200
@@ -23,7 +23,7 @@
* It has a runtime extension facility to allow it to
* efficiently support new methods
*/
-class HttpRequestMethod : public RefCountable
+class HttpRequestMethod
{
public:
HttpRequestMethod() : theMethod(Http::METHOD_NONE), theImage() {}
@@ -32,12 +32,6 @@
void HttpRequestMethodXXX(char const *); // deprecated old c-string to SBuf converter.
- HttpRequestMethod & operator = (const HttpRequestMethod& aMethod) {
- theMethod = aMethod.theMethod;
- theImage = aMethod.theImage;
- return *this;
- }
-
HttpRequestMethod & operator = (Http::MethodType const aMethod) {
theMethod = aMethod;
theImage.clear();
diff -u -r -N squid-5.0.6/src/http/url_rewriters/LFS/url_lfs_rewrite.8 squid-5.0.7/src/http/url_rewriters/LFS/url_lfs_rewrite.8
--- squid-5.0.6/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2021-05-10 23:02:24.000000000 +1200
+++ squid-5.0.7/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2021-07-05 22:45:48.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "URL_LFS_REWRITE 8"
-.TH URL_LFS_REWRITE 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH URL_LFS_REWRITE 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/src/icmp/Makefile.am squid-5.0.7/src/icmp/Makefile.am
--- squid-5.0.6/src/icmp/Makefile.am 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/icmp/Makefile.am 2021-07-05 20:27:18.000000000 +1200
@@ -39,7 +39,6 @@
debug.cc \
globals.cc \
SquidConfig.cc \
- SquidNew.cc \
tests/stub_fd.cc \
tests/stub_HelperChildConfig.cc \
tests/stub_libmem.cc \
@@ -96,9 +95,6 @@
SquidConfig.cc: $(top_srcdir)/src/SquidConfig.cc
cp $(top_srcdir)/src/SquidConfig.cc $@
-SquidNew.cc: $(top_srcdir)/src/SquidNew.cc
- cp $(top_srcdir)/src/SquidNew.cc $@
-
tests/stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc
cp $(top_srcdir)/src/tests/stub_HelperChildConfig.cc $@
diff -u -r -N squid-5.0.6/src/icmp/Makefile.in squid-5.0.7/src/icmp/Makefile.in
--- squid-5.0.6/src/icmp/Makefile.in 2021-05-10 22:57:55.000000000 +1200
+++ squid-5.0.7/src/icmp/Makefile.in 2021-07-05 22:41:17.000000000 +1200
@@ -182,8 +182,8 @@
IcmpPinger.$(OBJEXT) pinger.$(OBJEXT)
am__dirstamp = $(am__leading_dot)dirstamp
am__objects_1 = debug.$(OBJEXT) globals.$(OBJEXT) \
- SquidConfig.$(OBJEXT) SquidNew.$(OBJEXT) \
- tests/stub_fd.$(OBJEXT) tests/stub_HelperChildConfig.$(OBJEXT) \
+ SquidConfig.$(OBJEXT) tests/stub_fd.$(OBJEXT) \
+ tests/stub_HelperChildConfig.$(OBJEXT) \
tests/stub_libmem.$(OBJEXT) tests/stub_SBuf.$(OBJEXT) \
time.$(OBJEXT)
nodist_pinger_OBJECTS = $(am__objects_1)
@@ -216,10 +216,10 @@
am__depfiles_remade = ./$(DEPDIR)/Icmp.Plo ./$(DEPDIR)/Icmp4.Po \
./$(DEPDIR)/Icmp6.Po ./$(DEPDIR)/IcmpConfig.Plo \
./$(DEPDIR)/IcmpPinger.Po ./$(DEPDIR)/IcmpSquid.Plo \
- ./$(DEPDIR)/SquidConfig.Po ./$(DEPDIR)/SquidNew.Po \
- ./$(DEPDIR)/debug.Po ./$(DEPDIR)/globals.Po \
- ./$(DEPDIR)/net_db.Plo ./$(DEPDIR)/pinger.Po \
- ./$(DEPDIR)/time.Po tests/$(DEPDIR)/stub_HelperChildConfig.Po \
+ ./$(DEPDIR)/SquidConfig.Po ./$(DEPDIR)/debug.Po \
+ ./$(DEPDIR)/globals.Po ./$(DEPDIR)/net_db.Plo \
+ ./$(DEPDIR)/pinger.Po ./$(DEPDIR)/time.Po \
+ tests/$(DEPDIR)/stub_HelperChildConfig.Po \
tests/$(DEPDIR)/stub_SBuf.Po tests/$(DEPDIR)/stub_fd.Po \
tests/$(DEPDIR)/stub_libmem.Po
am__mv = mv -f
@@ -788,7 +788,6 @@
debug.cc \
globals.cc \
SquidConfig.cc \
- SquidNew.cc \
tests/stub_fd.cc \
tests/stub_HelperChildConfig.cc \
tests/stub_libmem.cc \
@@ -960,7 +959,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IcmpPinger.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IcmpSquid.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SquidConfig.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SquidNew.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globals.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_db.Plo@am__quote@ # am--include-marker
@@ -1313,7 +1311,6 @@
-rm -f ./$(DEPDIR)/IcmpPinger.Po
-rm -f ./$(DEPDIR)/IcmpSquid.Plo
-rm -f ./$(DEPDIR)/SquidConfig.Po
- -rm -f ./$(DEPDIR)/SquidNew.Po
-rm -f ./$(DEPDIR)/debug.Po
-rm -f ./$(DEPDIR)/globals.Po
-rm -f ./$(DEPDIR)/net_db.Plo
@@ -1375,7 +1372,6 @@
-rm -f ./$(DEPDIR)/IcmpPinger.Po
-rm -f ./$(DEPDIR)/IcmpSquid.Plo
-rm -f ./$(DEPDIR)/SquidConfig.Po
- -rm -f ./$(DEPDIR)/SquidNew.Po
-rm -f ./$(DEPDIR)/debug.Po
-rm -f ./$(DEPDIR)/globals.Po
-rm -f ./$(DEPDIR)/net_db.Plo
@@ -1443,9 +1439,6 @@
SquidConfig.cc: $(top_srcdir)/src/SquidConfig.cc
cp $(top_srcdir)/src/SquidConfig.cc $@
-SquidNew.cc: $(top_srcdir)/src/SquidNew.cc
- cp $(top_srcdir)/src/SquidNew.cc $@
-
tests/stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc
cp $(top_srcdir)/src/tests/stub_HelperChildConfig.cc $@
diff -u -r -N squid-5.0.6/src/ip/Intercept.cc squid-5.0.7/src/ip/Intercept.cc
--- squid-5.0.6/src/ip/Intercept.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/ip/Intercept.cc 2021-07-05 20:27:18.000000000 +1200
@@ -129,7 +129,7 @@
}
bool
-Ip::Intercept::NetfilterInterception(const Comm::ConnectionPointer &newConn, int silent)
+Ip::Intercept::NetfilterInterception(const Comm::ConnectionPointer &newConn)
{
#if LINUX_NETFILTER
struct sockaddr_storage lookup;
@@ -143,12 +143,8 @@
newConn->local.isIPv6() ? IP6T_SO_ORIGINAL_DST : SO_ORIGINAL_DST,
&lookup,
&len) != 0) {
- if (!silent) {
- int xerrno = errno;
- debugs(89, DBG_IMPORTANT, "ERROR: NF getsockopt(ORIGINAL_DST) failed on " << newConn << ": " << xstrerr(xerrno));
- lastReported_ = squid_curtime;
- }
- debugs(89, 9, "address: " << newConn);
+ const auto xerrno = errno;
+ debugs(89, DBG_IMPORTANT, "ERROR: NF getsockopt(ORIGINAL_DST) failed on " << newConn << ": " << xstrerr(xerrno));
return false;
} else {
newConn->local = lookup;
@@ -160,7 +156,7 @@
}
bool
-Ip::Intercept::TproxyTransparent(const Comm::ConnectionPointer &newConn, int)
+Ip::Intercept::TproxyTransparent(const Comm::ConnectionPointer &newConn)
{
#if (LINUX_NETFILTER && defined(IP_TRANSPARENT)) || \
(PF_TRANSPARENT && defined(SO_BINDANY)) || \
@@ -177,7 +173,7 @@
}
bool
-Ip::Intercept::IpfwInterception(const Comm::ConnectionPointer &newConn, int)
+Ip::Intercept::IpfwInterception(const Comm::ConnectionPointer &newConn)
{
#if IPFW_TRANSPARENT
/* The getsockname() call performed already provided the TCP packet details.
@@ -192,7 +188,7 @@
}
bool
-Ip::Intercept::IpfInterception(const Comm::ConnectionPointer &newConn, int silent)
+Ip::Intercept::IpfInterception(const Comm::ConnectionPointer &newConn)
{
#if IPF_TRANSPARENT /* --enable-ipf-transparent */
@@ -243,12 +239,9 @@
}
if (natfd < 0) {
- if (!silent) {
- int xerrno = errno;
- debugs(89, DBG_IMPORTANT, "IPF (IPFilter) NAT open failed: " << xstrerr(xerrno));
- lastReported_ = squid_curtime;
- return false;
- }
+ const auto xerrno = errno;
+ debugs(89, DBG_IMPORTANT, "ERROR: IPF (IPFilter) NAT open failed: " << xstrerr(xerrno));
+ return false;
}
#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
@@ -278,13 +271,9 @@
#endif
if (x < 0) {
- int xerrno = errno;
+ const auto xerrno = errno;
if (xerrno != ESRCH) {
- if (!silent) {
- debugs(89, DBG_IMPORTANT, "IPF (IPFilter) NAT lookup failed: ioctl(SIOCGNATL) (v=" << IPFILTER_VERSION << "): " << xstrerr(xerrno));
- lastReported_ = squid_curtime;
- }
-
+ debugs(89, DBG_IMPORTANT, "ERROR: IPF (IPFilter) NAT lookup failed: ioctl(SIOCGNATL) (v=" << IPFILTER_VERSION << "): " << xstrerr(xerrno));
close(natfd);
natfd = -1;
}
@@ -310,7 +299,7 @@
}
bool
-Ip::Intercept::PfInterception(const Comm::ConnectionPointer &newConn, int silent)
+Ip::Intercept::PfInterception(const Comm::ConnectionPointer &newConn)
{
#if PF_TRANSPARENT /* --enable-pf-transparent */
@@ -333,11 +322,8 @@
pffd = open("/dev/pf", O_RDONLY);
if (pffd < 0) {
- if (!silent) {
- int xerrno = errno;
- debugs(89, DBG_IMPORTANT, MYNAME << "PF open failed: " << xstrerr(xerrno));
- lastReported_ = squid_curtime;
- }
+ const auto xerrno = errno;
+ debugs(89, DBG_IMPORTANT, "ERROR: PF open failed: " << xstrerr(xerrno));
return false;
}
@@ -360,12 +346,9 @@
nl.direction = PF_OUT;
if (ioctl(pffd, DIOCNATLOOK, &nl)) {
- int xerrno = errno;
+ const auto xerrno = errno;
if (xerrno != ENOENT) {
- if (!silent) {
- debugs(89, DBG_IMPORTANT, HERE << "PF lookup failed: ioctl(DIOCNATLOOK): " << xstrerr(xerrno));
- lastReported_ = squid_curtime;
- }
+ debugs(89, DBG_IMPORTANT, "ERROR: PF lookup failed: ioctl(DIOCNATLOOK): " << xstrerr(xerrno));
close(pffd);
pffd = -1;
}
@@ -394,31 +377,23 @@
/* --enable-pf-transparent */
#if IPF_TRANSPARENT || LINUX_NETFILTER || IPFW_TRANSPARENT || PF_TRANSPARENT
-#if 0
- // Crop interception errors down to one per minute.
- int silent = (squid_curtime - lastReported_ > 60 ? 0 : 1);
-#else
- // Show all interception errors.
- int silent = 0;
-#endif
-
debugs(89, 5, HERE << "address BEGIN: me/client= " << newConn->local << ", destination/me= " << newConn->remote);
newConn->flags |= (listenConn->flags & (COMM_TRANSPARENT|COMM_INTERCEPTION));
/* NP: try TPROXY first, its much quieter than NAT when non-matching */
if (transparentActive_ && listenConn->flags&COMM_TRANSPARENT) {
- if (TproxyTransparent(newConn, silent)) return true;
+ if (TproxyTransparent(newConn)) return true;
}
if (interceptActive_ && listenConn->flags&COMM_INTERCEPTION) {
/* NAT methods that use sock-opts to return client address */
- if (NetfilterInterception(newConn, silent)) return true;
- if (IpfwInterception(newConn, silent)) return true;
+ if (NetfilterInterception(newConn)) return true;
+ if (IpfwInterception(newConn)) return true;
/* NAT methods that use ioctl to return client address AND destination address */
- if (PfInterception(newConn, silent)) return true;
- if (IpfInterception(newConn, silent)) return true;
+ if (PfInterception(newConn)) return true;
+ if (IpfInterception(newConn)) return true;
}
#else /* none of the transparent options configured */
diff -u -r -N squid-5.0.6/src/ip/Intercept.h squid-5.0.7/src/ip/Intercept.h
--- squid-5.0.6/src/ip/Intercept.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/ip/Intercept.h 2021-07-05 20:27:18.000000000 +1200
@@ -11,9 +11,6 @@
#ifndef SQUID_IP_IPINTERCEPT_H
#define SQUID_IP_IPINTERCEPT_H
-/* for time_t */
-#include "SquidTime.h"
-
namespace Ip
{
@@ -30,7 +27,7 @@
class Intercept
{
public:
- Intercept() : transparentActive_(0), interceptActive_(0), lastReported_(0) {};
+ Intercept() : transparentActive_(0), interceptActive_(0) {}
~Intercept() {};
/** Perform NAT lookups */
@@ -95,51 +92,45 @@
* perform Lookups on fully-transparent interception targets (TPROXY).
* Supports Netfilter, PF and IPFW.
*
- * \param silent 0 if errors are to be displayed. 1 if errors are to be hidden.
* \param newConn Details known, to be updated where relevant.
* \return Whether successfuly located the new address.
*/
- bool TproxyTransparent(const Comm::ConnectionPointer &newConn, int silent);
+ bool TproxyTransparent(const Comm::ConnectionPointer &newConn);
/**
* perform Lookups on Netfilter interception targets (REDIRECT, DNAT).
*
- * \param silent 0 if errors are to be displayed. 1 if errors are to be hidden.
* \param newConn Details known, to be updated where relevant.
* \return Whether successfuly located the new address.
*/
- bool NetfilterInterception(const Comm::ConnectionPointer &newConn, int silent);
+ bool NetfilterInterception(const Comm::ConnectionPointer &newConn);
/**
* perform Lookups on IPFW interception.
*
- * \param silent 0 if errors are to be displayed. 1 if errors are to be hidden.
* \param newConn Details known, to be updated where relevant.
* \return Whether successfuly located the new address.
*/
- bool IpfwInterception(const Comm::ConnectionPointer &newConn, int silent);
+ bool IpfwInterception(const Comm::ConnectionPointer &newConn);
/**
* perform Lookups on IPF interception.
*
- * \param silent 0 if errors are to be displayed. 1 if errors are to be hidden.
* \param newConn Details known, to be updated where relevant.
* \return Whether successfuly located the new address.
*/
- bool IpfInterception(const Comm::ConnectionPointer &newConn, int silent);
+ bool IpfInterception(const Comm::ConnectionPointer &newConn);
/**
* perform Lookups on PF interception target (REDIRECT).
*
- * \param silent 0 if errors are to be displayed. 1 if errors are to be hidden.
* \param newConn Details known, to be updated where relevant.
* \return Whether successfuly located the new address.
*/
- bool PfInterception(const Comm::ConnectionPointer &newConn, int silent);
+ bool PfInterception(const Comm::ConnectionPointer &newConn);
int transparentActive_;
int interceptActive_;
- time_t lastReported_; /**< Time of last error report. Throttles NAT error display to 1 per minute */
};
#if LINUX_NETFILTER && !defined(IP_TRANSPARENT)
diff -u -r -N squid-5.0.6/src/ipc/QuestionerId.cc squid-5.0.7/src/ipc/QuestionerId.cc
--- squid-5.0.6/src/ipc/QuestionerId.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/ipc/QuestionerId.cc 2021-07-05 20:27:18.000000000 +1200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
diff -u -r -N squid-5.0.6/src/ipc/QuestionerId.h squid-5.0.7/src/ipc/QuestionerId.h
--- squid-5.0.6/src/ipc/QuestionerId.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/ipc/QuestionerId.h 2021-07-05 20:27:18.000000000 +1200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
diff -u -r -N squid-5.0.6/src/ipc/RequestId.cc squid-5.0.7/src/ipc/RequestId.cc
--- squid-5.0.6/src/ipc/RequestId.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/ipc/RequestId.cc 2021-07-05 20:27:18.000000000 +1200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
diff -u -r -N squid-5.0.6/src/ipc/RequestId.h squid-5.0.7/src/ipc/RequestId.h
--- squid-5.0.6/src/ipc/RequestId.h 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/ipc/RequestId.h 2021-07-05 20:27:18.000000000 +1200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1996-2020 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
diff -u -r -N squid-5.0.6/src/log/DB/log_db_daemon.8 squid-5.0.7/src/log/DB/log_db_daemon.8
--- squid-5.0.6/src/log/DB/log_db_daemon.8 2021-05-10 23:02:24.000000000 +1200
+++ squid-5.0.7/src/log/DB/log_db_daemon.8 2021-07-05 22:45:48.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "LOG_DB_DAEMON 8"
-.TH LOG_DB_DAEMON 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH LOG_DB_DAEMON 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/src/Makefile.am squid-5.0.7/src/Makefile.am
--- squid-5.0.6/src/Makefile.am 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/Makefile.am 2021-07-05 20:27:18.000000000 +1200
@@ -343,7 +343,6 @@
SBufStatsAction.h \
SquidMath.cc \
SquidMath.h \
- SquidNew.cc \
StatCounters.cc \
StatCounters.h \
StatHist.cc \
@@ -630,7 +629,6 @@
MemBuf.h \
Parsing.h \
RemovalPolicy.cc \
- SquidNew.cc \
tests/stub_StoreMeta.cc \
StoreMetaUnpacker.cc \
String.cc \
diff -u -r -N squid-5.0.6/src/Makefile.in squid-5.0.7/src/Makefile.in
--- squid-5.0.6/src/Makefile.in 2021-05-10 22:57:53.000000000 +1200
+++ squid-5.0.7/src/Makefile.in 2021-07-05 22:41:15.000000000 +1200
@@ -296,11 +296,11 @@
RemovalPolicy.cc RemovalPolicy.h RequestFlags.cc \
RequestFlags.h ResolvedPeers.cc ResolvedPeers.h \
SBufStatsAction.cc SBufStatsAction.h SquidMath.cc SquidMath.h \
- SquidNew.cc StatCounters.cc StatCounters.h StatHist.cc \
- StatHist.h Store.h StoreClient.h StoreFileSystem.cc \
- StoreFileSystem.h StoreIOBuffer.h StoreIOState.cc \
- StoreIOState.h StoreMetaUnpacker.cc StoreMetaUnpacker.h \
- StoreSearch.h StoreStats.cc StoreStats.h StoreSwapLogData.cc \
+ StatCounters.cc StatCounters.h StatHist.cc StatHist.h Store.h \
+ StoreClient.h StoreFileSystem.cc StoreFileSystem.h \
+ StoreIOBuffer.h StoreIOState.cc StoreIOState.h \
+ StoreMetaUnpacker.cc StoreMetaUnpacker.h StoreSearch.h \
+ StoreStats.cc StoreStats.h StoreSwapLogData.cc \
StoreSwapLogData.h StrList.cc StrList.h String.cc TimeOrTag.h \
Transients.cc Transients.h XactionInitiator.cc \
XactionInitiator.h XactionStep.h cache_cf.cc cache_cf.h \
@@ -381,7 +381,7 @@
Pipeline.$(OBJEXT) RemovalPolicy.$(OBJEXT) \
RequestFlags.$(OBJEXT) ResolvedPeers.$(OBJEXT) \
SBufStatsAction.$(OBJEXT) SquidMath.$(OBJEXT) \
- SquidNew.$(OBJEXT) StatCounters.$(OBJEXT) StatHist.$(OBJEXT) \
+ StatCounters.$(OBJEXT) StatHist.$(OBJEXT) \
StoreFileSystem.$(OBJEXT) StoreIOState.$(OBJEXT) \
StoreMetaUnpacker.$(OBJEXT) StoreStats.$(OBJEXT) \
StoreSwapLogData.$(OBJEXT) StrList.$(OBJEXT) String.$(OBJEXT) \
@@ -2078,19 +2078,18 @@
$(LDFLAGS) -o $@
am__ufsdump_SOURCES_DIST = win32.cc ClientInfo.h \
tests/stub_HelperChildConfig.cc MemBuf.cc MemBuf.h Parsing.h \
- RemovalPolicy.cc SquidNew.cc tests/stub_StoreMeta.cc \
- StoreMetaUnpacker.cc String.cc cbdata.cc cbdata.h debug.cc \
- dlink.cc dlink.h tests/stub_fd.cc fd.h helper/ChildConfig.h \
- int.cc int.h mem/forward.h store_key_md5.cc store_key_md5.h \
+ RemovalPolicy.cc tests/stub_StoreMeta.cc StoreMetaUnpacker.cc \
+ String.cc cbdata.cc cbdata.h debug.cc dlink.cc dlink.h \
+ tests/stub_fd.cc fd.h helper/ChildConfig.h int.cc int.h \
+ mem/forward.h store_key_md5.cc store_key_md5.h \
tests/stub_time.cc ufsdump.cc
am_ufsdump_OBJECTS = $(am__objects_12) \
tests/stub_HelperChildConfig.$(OBJEXT) MemBuf.$(OBJEXT) \
- RemovalPolicy.$(OBJEXT) SquidNew.$(OBJEXT) \
- tests/stub_StoreMeta.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \
- String.$(OBJEXT) cbdata.$(OBJEXT) debug.$(OBJEXT) \
- dlink.$(OBJEXT) tests/stub_fd.$(OBJEXT) int.$(OBJEXT) \
- store_key_md5.$(OBJEXT) tests/stub_time.$(OBJEXT) \
- ufsdump.$(OBJEXT)
+ RemovalPolicy.$(OBJEXT) tests/stub_StoreMeta.$(OBJEXT) \
+ StoreMetaUnpacker.$(OBJEXT) String.$(OBJEXT) cbdata.$(OBJEXT) \
+ debug.$(OBJEXT) dlink.$(OBJEXT) tests/stub_fd.$(OBJEXT) \
+ int.$(OBJEXT) store_key_md5.$(OBJEXT) \
+ tests/stub_time.$(OBJEXT) ufsdump.$(OBJEXT)
nodist_ufsdump_OBJECTS = globals.$(OBJEXT)
ufsdump_OBJECTS = $(am_ufsdump_OBJECTS) $(nodist_ufsdump_OBJECTS)
am_unlinkd_OBJECTS = unlinkd_daemon.$(OBJEXT)
@@ -2146,20 +2145,20 @@
./$(DEPDIR)/RemovalPolicy.Po ./$(DEPDIR)/RequestFlags.Po \
./$(DEPDIR)/ResolvedPeers.Po ./$(DEPDIR)/SBufStatsAction.Po \
./$(DEPDIR)/SquidConfig.Plo ./$(DEPDIR)/SquidMath.Po \
- ./$(DEPDIR)/SquidNew.Po ./$(DEPDIR)/StatCounters.Po \
- ./$(DEPDIR)/StatHist.Po ./$(DEPDIR)/StoreFileSystem.Po \
- ./$(DEPDIR)/StoreIOState.Po ./$(DEPDIR)/StoreMeta.Po \
- ./$(DEPDIR)/StoreMetaMD5.Po ./$(DEPDIR)/StoreMetaSTD.Po \
- ./$(DEPDIR)/StoreMetaSTDLFS.Po ./$(DEPDIR)/StoreMetaURL.Po \
- ./$(DEPDIR)/StoreMetaUnpacker.Po ./$(DEPDIR)/StoreMetaVary.Po \
- ./$(DEPDIR)/StoreStats.Po ./$(DEPDIR)/StoreSwapLogData.Po \
- ./$(DEPDIR)/StrList.Po ./$(DEPDIR)/String.Po \
- ./$(DEPDIR)/Transients.Po ./$(DEPDIR)/WinSvc.Po \
- ./$(DEPDIR)/XactionInitiator.Po ./$(DEPDIR)/cache_cf.Po \
- ./$(DEPDIR)/cache_manager.Po ./$(DEPDIR)/carp.Po \
- ./$(DEPDIR)/cbdata.Po ./$(DEPDIR)/cf_gen.Po \
- ./$(DEPDIR)/clientStream.Po ./$(DEPDIR)/client_db.Po \
- ./$(DEPDIR)/client_side.Po ./$(DEPDIR)/client_side_reply.Po \
+ ./$(DEPDIR)/StatCounters.Po ./$(DEPDIR)/StatHist.Po \
+ ./$(DEPDIR)/StoreFileSystem.Po ./$(DEPDIR)/StoreIOState.Po \
+ ./$(DEPDIR)/StoreMeta.Po ./$(DEPDIR)/StoreMetaMD5.Po \
+ ./$(DEPDIR)/StoreMetaSTD.Po ./$(DEPDIR)/StoreMetaSTDLFS.Po \
+ ./$(DEPDIR)/StoreMetaURL.Po ./$(DEPDIR)/StoreMetaUnpacker.Po \
+ ./$(DEPDIR)/StoreMetaVary.Po ./$(DEPDIR)/StoreStats.Po \
+ ./$(DEPDIR)/StoreSwapLogData.Po ./$(DEPDIR)/StrList.Po \
+ ./$(DEPDIR)/String.Po ./$(DEPDIR)/Transients.Po \
+ ./$(DEPDIR)/WinSvc.Po ./$(DEPDIR)/XactionInitiator.Po \
+ ./$(DEPDIR)/cache_cf.Po ./$(DEPDIR)/cache_manager.Po \
+ ./$(DEPDIR)/carp.Po ./$(DEPDIR)/cbdata.Po \
+ ./$(DEPDIR)/cf_gen.Po ./$(DEPDIR)/clientStream.Po \
+ ./$(DEPDIR)/client_db.Po ./$(DEPDIR)/client_side.Po \
+ ./$(DEPDIR)/client_side_reply.Po \
./$(DEPDIR)/client_side_request.Po ./$(DEPDIR)/comm.Plo \
./$(DEPDIR)/debug.Po ./$(DEPDIR)/delay_pools.Po \
./$(DEPDIR)/dlink.Po ./$(DEPDIR)/dns_internal.Po \
@@ -3114,11 +3113,11 @@
RemovalPolicy.cc RemovalPolicy.h RequestFlags.cc \
RequestFlags.h ResolvedPeers.cc ResolvedPeers.h \
SBufStatsAction.cc SBufStatsAction.h SquidMath.cc SquidMath.h \
- SquidNew.cc StatCounters.cc StatCounters.h StatHist.cc \
- StatHist.h Store.h StoreClient.h StoreFileSystem.cc \
- StoreFileSystem.h StoreIOBuffer.h StoreIOState.cc \
- StoreIOState.h StoreMetaUnpacker.cc StoreMetaUnpacker.h \
- StoreSearch.h StoreStats.cc StoreStats.h StoreSwapLogData.cc \
+ StatCounters.cc StatCounters.h StatHist.cc StatHist.h Store.h \
+ StoreClient.h StoreFileSystem.cc StoreFileSystem.h \
+ StoreIOBuffer.h StoreIOState.cc StoreIOState.h \
+ StoreMetaUnpacker.cc StoreMetaUnpacker.h StoreSearch.h \
+ StoreStats.cc StoreStats.h StoreSwapLogData.cc \
StoreSwapLogData.h StrList.cc StrList.h String.cc TimeOrTag.h \
Transients.cc Transients.h XactionInitiator.cc \
XactionInitiator.h XactionStep.h cache_cf.cc cache_cf.h \
@@ -3215,7 +3214,6 @@
MemBuf.h \
Parsing.h \
RemovalPolicy.cc \
- SquidNew.cc \
tests/stub_StoreMeta.cc \
StoreMetaUnpacker.cc \
String.cc \
@@ -6517,7 +6515,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SBufStatsAction.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SquidConfig.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SquidMath.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SquidNew.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StatCounters.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StatHist.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StoreFileSystem.Po@am__quote@ # am--include-marker
@@ -7514,7 +7511,6 @@
-rm -f ./$(DEPDIR)/SBufStatsAction.Po
-rm -f ./$(DEPDIR)/SquidConfig.Plo
-rm -f ./$(DEPDIR)/SquidMath.Po
- -rm -f ./$(DEPDIR)/SquidNew.Po
-rm -f ./$(DEPDIR)/StatCounters.Po
-rm -f ./$(DEPDIR)/StatHist.Po
-rm -f ./$(DEPDIR)/StoreFileSystem.Po
@@ -7847,7 +7843,6 @@
-rm -f ./$(DEPDIR)/SBufStatsAction.Po
-rm -f ./$(DEPDIR)/SquidConfig.Plo
-rm -f ./$(DEPDIR)/SquidMath.Po
- -rm -f ./$(DEPDIR)/SquidNew.Po
-rm -f ./$(DEPDIR)/StatCounters.Po
-rm -f ./$(DEPDIR)/StatHist.Po
-rm -f ./$(DEPDIR)/StoreFileSystem.Po
diff -u -r -N squid-5.0.6/src/MemStore.cc squid-5.0.7/src/MemStore.cc
--- squid-5.0.6/src/MemStore.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/MemStore.cc 2021-07-05 20:27:18.000000000 +1200
@@ -1011,7 +1011,7 @@
Ipc::Mem::PageStack::Config spaceConfig;
spaceConfig.poolId = Ipc::Mem::PageStack::IdForMemStoreSpace(),
- spaceConfig.pageSize = 0; // the pages are stored in Ipc::Mem::Pages
+ spaceConfig.pageSize = 0; // the pages are stored in Ipc::Mem::Pages
spaceConfig.capacity = entryLimit;
spaceConfig.createFull = true; // all pages are initially available
Must(!spaceOwner);
diff -u -r -N squid-5.0.6/src/peer_select.cc squid-5.0.7/src/peer_select.cc
--- squid-5.0.6/src/peer_select.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/peer_select.cc 2021-07-05 20:27:18.000000000 +1200
@@ -171,7 +171,7 @@
CallBack(selector->al, [selector,this] {
selector->ping.monitorRegistration = npos();
AsyncCall::Pointer callback = asyncCall(44, 4, "PeerSelector::HandlePingTimeout",
- cbdataDialer(PeerSelector::HandlePingTimeout, selector));
+ cbdataDialer(PeerSelector::HandlePingTimeout, selector));
ScheduleCallHere(callback);
});
selectors.erase(selectors.begin());
diff -u -r -N squid-5.0.6/src/security/cert_validators/fake/security_fake_certverify.8 squid-5.0.7/src/security/cert_validators/fake/security_fake_certverify.8
--- squid-5.0.6/src/security/cert_validators/fake/security_fake_certverify.8 2021-05-10 23:02:25.000000000 +1200
+++ squid-5.0.7/src/security/cert_validators/fake/security_fake_certverify.8 2021-07-05 22:45:49.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "SECURITY_FAKE_CERTVERIFY 8"
-.TH SECURITY_FAKE_CERTVERIFY 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH SECURITY_FAKE_CERTVERIFY 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/src/SquidNew.cc squid-5.0.7/src/SquidNew.cc
--- squid-5.0.6/src/SquidNew.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/SquidNew.cc 1970-01-01 12:00:00.000000000 +1200
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
- *
- * Squid software is distributed under GPLv2+ license and includes
- * contributions from numerous individuals and organizations.
- * Please see the COPYING and CONTRIBUTORS files for details.
- */
-
-/* DEBUG: none Memory Allocation */
-
-#include "squid.h"
-
-#if !defined(__clang__) && !defined(__SUNPRO_CC)
-
-#include
-
-void *operator new(size_t size)
-{
- return xmalloc(size);
-}
-void operator delete(void *address)
-{
- xfree(address);
-}
-
-#endif /* !defined(__clang__) */
-
diff -u -r -N squid-5.0.6/src/ssl/helper.cc squid-5.0.7/src/ssl/helper.cc
--- squid-5.0.6/src/ssl/helper.cc 2021-05-10 21:02:34.000000000 +1200
+++ squid-5.0.7/src/ssl/helper.cc 2021-07-05 20:27:18.000000000 +1200
@@ -81,7 +81,7 @@
if (!found)
return;
- ssl_crtd = new helper(Ssl::TheConfig.ssl_crtd);
+ ssl_crtd = new helper("sslcrtd_program");
ssl_crtd->childs.updateLimits(Ssl::TheConfig.ssl_crtdChildren);
ssl_crtd->ipc_type = IPC_STREAM;
// The crtd messages may contain the eol ('\n') character. We are
diff -u -r -N squid-5.0.6/src/store/id_rewriters/file/storeid_file_rewrite.8 squid-5.0.7/src/store/id_rewriters/file/storeid_file_rewrite.8
--- squid-5.0.6/src/store/id_rewriters/file/storeid_file_rewrite.8 2021-05-10 23:02:23.000000000 +1200
+++ squid-5.0.7/src/store/id_rewriters/file/storeid_file_rewrite.8 2021-07-05 22:45:47.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "STOREID_FILE_REWRITE 8"
-.TH STOREID_FILE_REWRITE 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH STOREID_FILE_REWRITE 8 "2021-07-05" "perl v5.32.0" "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-5.0.6/test-suite/squidconf/bug4832 squid-5.0.7/test-suite/squidconf/bug4832
--- squid-5.0.6/test-suite/squidconf/bug4832 1970-01-01 12:00:00.000000000 +1200
+++ squid-5.0.7/test-suite/squidconf/bug4832 2021-07-05 20:27:18.000000000 +1200
@@ -0,0 +1,2 @@
+auth_param basic /dev/null
+auth_schemes basic all
diff -u -r -N squid-5.0.6/tools/helper-mux/helper-mux.8 squid-5.0.7/tools/helper-mux/helper-mux.8
--- squid-5.0.6/tools/helper-mux/helper-mux.8 2021-05-10 23:02:25.000000000 +1200
+++ squid-5.0.7/tools/helper-mux/helper-mux.8 2021-07-05 22:45:49.000000000 +1200
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "HELPER-MUX 8"
-.TH HELPER-MUX 8 "2021-05-10" "perl v5.32.0" "User Contributed Perl Documentation"
+.TH HELPER-MUX 8 "2021-07-05" "perl v5.32.0" "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