diff -u -r -N squid-4.0.7/ChangeLog squid-4.0.8/ChangeLog
--- squid-4.0.7/ChangeLog 2016-02-24 06:47:50.000000000 +1300
+++ squid-4.0.8/ChangeLog 2016-04-02 10:04:07.000000000 +1300
@@ -1,3 +1,22 @@
+Changes to squid-4.0.8 (02 Apr 2016):
+
+ - Bug 4459: FHS compliance: move netdb.state and ssl_db to /var/cache/squid
+ - Bug 4458: Behaviour change with external ACL arguments
+ - Bug 4450: wait() related cleanup
+ - Bug 4438: SIGSEGV in memFreeString() destructing SBuf globals on shutdown/restart
+ - Bug 4312: Support disabling collapsed forwarding SMP cooperation
+ - Bug 3826: SMP compatibility with systemd and --foreground option
+ - Bug 1979: Add ACL-driven server_pconn_for_nonretriable squid.conf directive
+ - Bug 7 (partial): Update cached entries on 304 responses
+ - Add reply_header_add directive
+ - HTTP/1.1: Do not prohibit updating Last-Modified on 304 responses
+ - Fix memory leaks of lastAclData and AccessLogentry::url
+ - Fix clang -Winconsistent-missing-override warning
+ - Tests: update test suite for GnuTLS
+ - ... and some documentation updates
+ - ... and some code cleanup and polishing
+ - ... and all fixes from squid 3.5.16
+
Changes to squid-4.0.7 (23 Feb 2016):
- Regression Fix: external_acl parameters separated by %20 instead of space
@@ -120,6 +139,24 @@
- ... and many documentation changes
- ... and much code cleanup and polishing
+Changes to squid-3.5.16 (02 Apr 2016):
+
+ - Bug 4476: Removed duplicated #include lines
+ - Bug 4452: squid -z segfaults with ufs
+ - Bug 4447:FwdState.cc:447 "serverConnection() == conn" assertion
+ - Bug 4423: adding stdio: prefix to cache_log directive produces FATAL error
+ - Bug 4409: compile error when two Heimdal libraries are installed
+ - Bug 2831: Cache-control: max-age not sent on TCP_IMS_HIT/304
+ - pinger: Fix buffer overflow in Icmp6::Recv
+ - pinger: Fix select(2) to actually use max_fd
+ - pinger: drop capabilities on Linux
+ - Fix memory leak of HttpRequest objects
+ - Fix memory leak when the cache of sslcrtvalidator_program is disabled via ttl=0
+ - Fix assertion failed: Write.cc:41: "!ccb->active()"
+ - Fix crash on shutdown while cleaning up idle ICAP connections
+ - RFC 7725: Add registry entry for 451 status text
+ - ... and some build issues
+
Changes to squid-3.5.15 (23 Feb 2016):
- Bug 3870: assertion failed: String.cc: 'len_ + len <65536' in ESI::CustomParser
diff -u -r -N squid-4.0.7/compat/Makefile.in squid-4.0.8/compat/Makefile.in
--- squid-4.0.7/compat/Makefile.in 2016-02-24 06:48:59.000000000 +1300
+++ squid-4.0.8/compat/Makefile.in 2016-04-02 10:06:12.000000000 +1300
@@ -703,6 +703,25 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+DEFAULT_HTTP_PORT = 3128
+DEFAULT_ICP_PORT = 3130
+DEFAULT_PREFIX = $(prefix)
+DEFAULT_CONFIG_DIR = $(sysconfdir)
+DEFAULT_CONFIG_FILE = $(DEFAULT_CONFIG_DIR)/squid.conf
+DEFAULT_MIME_TABLE = $(DEFAULT_CONFIG_DIR)/mime.conf
+DEFAULT_SSL_CRTD = $(libexecdir)/`echo security_file_certgen | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
+DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+DEFAULT_SSL_DB_DIR = $(DEFAULT_SWAP_DIR)/ssl_db
+DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_ICON_DIR = $(datadir)/icons
+DEFAULT_ERROR_DIR = $(datadir)/errors
AM_CFLAGS = $(SQUID_CFLAGS)
AM_CXXFLAGS = $(SQUID_CXXFLAGS)
CLEANFILES = testHeaders
diff -u -r -N squid-4.0.7/configure squid-4.0.8/configure
--- squid-4.0.7/configure 2016-02-24 06:49:58.000000000 +1300
+++ squid-4.0.8/configure 2016-04-02 10:08:39.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.69 for Squid Web Proxy 4.0.7.
+# Generated by GNU Autoconf 2.69 for Squid Web Proxy 4.0.8.
#
# Report bugs to .
#
@@ -595,8 +595,8 @@
# Identity of this package.
PACKAGE_NAME='Squid Web Proxy'
PACKAGE_TARNAME='squid'
-PACKAGE_VERSION='4.0.7'
-PACKAGE_STRING='Squid Web Proxy 4.0.7'
+PACKAGE_VERSION='4.0.8'
+PACKAGE_STRING='Squid Web Proxy 4.0.8'
PACKAGE_BUGREPORT='http://bugs.squid-cache.org/'
PACKAGE_URL=''
@@ -1650,7 +1650,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 4.0.7 to adapt to many kinds of systems.
+\`configure' configures Squid Web Proxy 4.0.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1721,7 +1721,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Squid Web Proxy 4.0.7:";;
+ short | recursive ) echo "Configuration of Squid Web Proxy 4.0.8:";;
esac
cat <<\_ACEOF
@@ -2148,7 +2148,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Squid Web Proxy configure 4.0.7
+Squid Web Proxy configure 4.0.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3252,7 +3252,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 4.0.7, which was
+It was created by Squid Web Proxy $as_me 4.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4119,7 +4119,7 @@
# Define the identity of the package.
PACKAGE='squid'
- VERSION='4.0.7'
+ VERSION='4.0.8'
cat >>confdefs.h <<_ACEOF
@@ -20703,7 +20703,7 @@
SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow"
;;
esac
- SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow"
+ SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow -Woverloaded-virtual"
else
SQUID_CFLAGS=
SQUID_CXXFLAGS=
@@ -21949,15 +21949,18 @@
fi
;;
rock)
- if test "x$squid_disk_module_candidates_IpcIo" != "xyes" -a \
- "x$squid_disk_module_candidates_Blocking" != "xyes"; then
- as_fn_error $? "Storage module Rock requires IpcIo or Blocking DiskIO module" "$LINENO" 5
- fi
- squid_do_build_rock=true
- ;;
+ if test "x$squid_disk_module_candidates_IpcIo" != "xyes" -a \
+ "x$squid_disk_module_candidates_Blocking" != "xyes"; then
+ as_fn_error $? "Storage module Rock requires DiskIO module: Blocking or IpcIo" "$LINENO" 5
+ fi
+ squid_do_build_rock=true
+ ;;
ufs)
- squid_do_build_ufs=true
- ;;
+ if test "x$squid_disk_module_candidates_Blocking" != "xyes"; then
+ as_fn_error $? "Storage module ufs requires DiskIO module: Blocking" "$LINENO" 5
+ fi
+ squid_do_build_ufs=true
+ ;;
esac
done
@@ -27979,7 +27982,7 @@
if test "x$ac_cv_path_krb5_config" != "xno" ; then
krb5confpath="`dirname $ac_cv_path_krb5_config`"
ac_heimdal="`$ac_cv_path_krb5_config --version 2>/dev/null | grep -c -i heimdal`"
- if test "x$with_heimdal_krb5" = "xyes"; then
+ if test "x$with_heimdal_krb5" = "xyes" -a $ac_heimdal = 0; then
as_fn_error $? "Could not find pkg-config or krb5-config for Heimdal Kerberos" "$LINENO" 5
fi
else
@@ -41724,7 +41727,7 @@
rm -f core
-ac_config_files="$ac_config_files Makefile compat/Makefile contrib/Makefile doc/Makefile doc/manuals/Makefile doc/release-notes/Makefile errors/Makefile icons/Makefile lib/Makefile lib/libTrie/Makefile lib/libTrie/test/Makefile lib/ntlmauth/Makefile lib/profiler/Makefile lib/rfcnb/Makefile lib/smblib/Makefile lib/snmplib/Makefile scripts/Makefile src/Makefile src/acl/Makefile src/acl/external/Makefile src/acl/external/AD_group/Makefile src/acl/external/delayer/Makefile src/acl/external/eDirectory_userip/Makefile src/acl/external/file_userip/Makefile src/acl/external/kerberos_ldap_group/Makefile src/acl/external/LDAP_group/Makefile src/acl/external/LM_group/Makefile src/acl/external/session/Makefile src/acl/external/SQL_session/Makefile src/acl/external/unix_group/Makefile src/acl/external/wbinfo_group/Makefile src/acl/external/time_quota/Makefile src/adaptation/Makefile src/adaptation/icap/Makefile src/adaptation/ecap/Makefile src/anyp/Makefile src/auth/Makefile src/auth/basic/Makefile src/auth/basic/DB/Makefile src/auth/basic/fake/Makefile src/auth/basic/getpwnam/Makefile src/auth/basic/LDAP/Makefile src/auth/basic/NCSA/Makefile src/auth/basic/NIS/Makefile src/auth/basic/PAM/Makefile src/auth/basic/POP3/Makefile src/auth/basic/RADIUS/Makefile src/auth/basic/SASL/Makefile src/auth/basic/SMB/Makefile src/auth/basic/SMB_LM/Makefile src/auth/basic/SSPI/Makefile src/auth/digest/Makefile src/auth/digest/eDirectory/Makefile src/auth/digest/file/Makefile src/auth/digest/LDAP/Makefile src/auth/negotiate/Makefile src/auth/negotiate/kerberos/Makefile src/auth/negotiate/SSPI/Makefile src/auth/negotiate/wrapper/Makefile src/auth/ntlm/Makefile src/auth/ntlm/fake/Makefile src/auth/ntlm/SMB_LM/Makefile src/auth/ntlm/SSPI/Makefile src/base/Makefile src/clients/Makefile src/comm/Makefile src/dns/Makefile src/DiskIO/Makefile src/DiskIO/AIO/Makefile src/DiskIO/Blocking/Makefile src/DiskIO/DiskDaemon/Makefile src/DiskIO/DiskThreads/Makefile src/DiskIO/IpcIo/Makefile src/DiskIO/Mmapped/Makefile src/esi/Makefile src/eui/Makefile src/format/Makefile src/fs/Makefile src/ftp/Makefile src/helper/Makefile src/http/Makefile src/http/one/Makefile src/http/url_rewriters/Makefile src/http/url_rewriters/fake/Makefile src/http/url_rewriters/LFS/Makefile src/icmp/Makefile src/ident/Makefile src/ip/Makefile src/ipc/Makefile src/log/Makefile src/log/DB/Makefile src/log/file/Makefile src/mem/Makefile src/mgr/Makefile src/parser/Makefile src/repl/Makefile src/security/Makefile src/security/cert_generators/Makefile src/security/cert_generators/file/Makefile src/security/cert_validators/Makefile src/security/cert_validators/fake/Makefile src/servers/Makefile src/snmp/Makefile src/ssl/Makefile src/store/Makefile src/store/id_rewriters/Makefile src/store/id_rewriters/file/Makefile test-suite/Makefile tools/Makefile tools/helper-mux/Makefile tools/purge/Makefile tools/squidclient/Makefile tools/systemd/Makefile tools/sysvinit/Makefile"
+ac_config_files="$ac_config_files Makefile compat/Makefile contrib/Makefile doc/Makefile doc/manuals/Makefile doc/release-notes/Makefile errors/Makefile icons/Makefile lib/Makefile lib/libTrie/Makefile lib/libTrie/test/Makefile lib/ntlmauth/Makefile lib/profiler/Makefile lib/rfcnb/Makefile lib/smblib/Makefile lib/snmplib/Makefile scripts/Makefile src/Makefile src/acl/Makefile src/acl/external/Makefile src/acl/external/AD_group/Makefile src/acl/external/delayer/Makefile src/acl/external/eDirectory_userip/Makefile src/acl/external/file_userip/Makefile src/acl/external/kerberos_ldap_group/Makefile src/acl/external/LDAP_group/Makefile src/acl/external/LM_group/Makefile src/acl/external/session/Makefile src/acl/external/SQL_session/Makefile src/acl/external/unix_group/Makefile src/acl/external/wbinfo_group/Makefile src/acl/external/time_quota/Makefile src/adaptation/Makefile src/adaptation/icap/Makefile src/adaptation/ecap/Makefile src/anyp/Makefile src/auth/Makefile src/auth/basic/Makefile src/auth/basic/DB/Makefile src/auth/basic/fake/Makefile src/auth/basic/getpwnam/Makefile src/auth/basic/LDAP/Makefile src/auth/basic/NCSA/Makefile src/auth/basic/NIS/Makefile src/auth/basic/PAM/Makefile src/auth/basic/POP3/Makefile src/auth/basic/RADIUS/Makefile src/auth/basic/SASL/Makefile src/auth/basic/SMB/Makefile src/auth/basic/SMB_LM/Makefile src/auth/basic/SSPI/Makefile src/auth/digest/Makefile src/auth/digest/eDirectory/Makefile src/auth/digest/file/Makefile src/auth/digest/LDAP/Makefile src/auth/negotiate/Makefile src/auth/negotiate/kerberos/Makefile src/auth/negotiate/SSPI/Makefile src/auth/negotiate/wrapper/Makefile src/auth/ntlm/Makefile src/auth/ntlm/fake/Makefile src/auth/ntlm/SMB_LM/Makefile src/auth/ntlm/SSPI/Makefile src/base/Makefile src/clients/Makefile src/comm/Makefile src/dns/Makefile src/DiskIO/Makefile src/DiskIO/AIO/Makefile src/DiskIO/Blocking/Makefile src/DiskIO/DiskDaemon/Makefile src/DiskIO/DiskThreads/Makefile src/DiskIO/IpcIo/Makefile src/DiskIO/Mmapped/Makefile src/esi/Makefile src/eui/Makefile src/format/Makefile src/fs/Makefile src/ftp/Makefile src/helper/Makefile src/http/Makefile src/http/one/Makefile src/http/url_rewriters/Makefile src/http/url_rewriters/fake/Makefile src/http/url_rewriters/LFS/Makefile src/icmp/Makefile src/ident/Makefile src/ip/Makefile src/ipc/Makefile src/log/Makefile src/log/DB/Makefile src/log/file/Makefile src/mem/Makefile src/mgr/Makefile src/parser/Makefile src/repl/Makefile src/sbuf/Makefile src/security/Makefile src/security/cert_generators/Makefile src/security/cert_generators/file/Makefile src/security/cert_validators/Makefile src/security/cert_validators/fake/Makefile src/servers/Makefile src/snmp/Makefile src/ssl/Makefile src/store/Makefile src/store/id_rewriters/Makefile src/store/id_rewriters/file/Makefile test-suite/Makefile tools/Makefile tools/helper-mux/Makefile tools/purge/Makefile tools/squidclient/Makefile tools/systemd/Makefile tools/sysvinit/Makefile"
# must configure libltdl subdir unconditionally for "make distcheck" to work
@@ -42470,7 +42473,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 4.0.7, which was
+This file was extended by Squid Web Proxy $as_me 4.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -42536,7 +42539,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 4.0.7
+Squid Web Proxy config.status 4.0.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -43145,6 +43148,7 @@
"src/mgr/Makefile") CONFIG_FILES="$CONFIG_FILES src/mgr/Makefile" ;;
"src/parser/Makefile") CONFIG_FILES="$CONFIG_FILES src/parser/Makefile" ;;
"src/repl/Makefile") CONFIG_FILES="$CONFIG_FILES src/repl/Makefile" ;;
+ "src/sbuf/Makefile") CONFIG_FILES="$CONFIG_FILES src/sbuf/Makefile" ;;
"src/security/Makefile") CONFIG_FILES="$CONFIG_FILES src/security/Makefile" ;;
"src/security/cert_generators/Makefile") CONFIG_FILES="$CONFIG_FILES src/security/cert_generators/Makefile" ;;
"src/security/cert_generators/file/Makefile") CONFIG_FILES="$CONFIG_FILES src/security/cert_generators/file/Makefile" ;;
diff -u -r -N squid-4.0.7/configure.ac squid-4.0.8/configure.ac
--- squid-4.0.7/configure.ac 2016-02-24 06:49:58.000000000 +1300
+++ squid-4.0.8/configure.ac 2016-04-02 10:08:38.000000000 +1300
@@ -5,7 +5,7 @@
## Please see the COPYING and CONTRIBUTORS files for details.
##
-AC_INIT([Squid Web Proxy],[4.0.7],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.0.8],[http://bugs.squid-cache.org/],[squid])
AC_PREREQ(2.61)
AC_CONFIG_HEADERS([include/autoconf.h])
AC_CONFIG_AUX_DIR(cfgaux)
@@ -345,7 +345,7 @@
SQUID_CFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments -Wshadow"
;;
esac
- SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow"
+ SQUID_CXXFLAGS="$squid_cv_cc_option_wall -Wpointer-arith -Wwrite-strings -Wcomments -Wshadow -Woverloaded-virtual"
else
SQUID_CFLAGS=
SQUID_CXXFLAGS=
@@ -788,15 +788,18 @@
fi
;;
rock)
- if test "x$squid_disk_module_candidates_IpcIo" != "xyes" -a \
- "x$squid_disk_module_candidates_Blocking" != "xyes"; then
- AC_MSG_ERROR([Storage module Rock requires IpcIo or Blocking DiskIO module])
- fi
- squid_do_build_rock=true
- ;;
+ if test "x$squid_disk_module_candidates_IpcIo" != "xyes" -a \
+ "x$squid_disk_module_candidates_Blocking" != "xyes"; then
+ AC_MSG_ERROR([Storage module Rock requires DiskIO module: Blocking or IpcIo])
+ fi
+ squid_do_build_rock=true
+ ;;
ufs)
- squid_do_build_ufs=true
- ;;
+ if test "x$squid_disk_module_candidates_Blocking" != "xyes"; then
+ AC_MSG_ERROR([Storage module ufs requires DiskIO module: Blocking])
+ fi
+ squid_do_build_ufs=true
+ ;;
esac
done
@@ -1626,7 +1629,7 @@
if test "x$ac_cv_path_krb5_config" != "xno" ; then
krb5confpath="`dirname $ac_cv_path_krb5_config`"
ac_heimdal="`$ac_cv_path_krb5_config --version 2>/dev/null | grep -c -i heimdal`"
- if test "x$with_heimdal_krb5" = "xyes"; then
+ if test "x$with_heimdal_krb5" = "xyes" -a $ac_heimdal = 0; then
AC_MSG_ERROR([Could not find pkg-config or krb5-config for Heimdal Kerberos])
fi
else
@@ -3881,6 +3884,7 @@
src/mgr/Makefile
src/parser/Makefile
src/repl/Makefile
+ src/sbuf/Makefile
src/security/Makefile
src/security/cert_generators/Makefile
src/security/cert_generators/file/Makefile
diff -u -r -N squid-4.0.7/doc/manuals/Substitute.am squid-4.0.8/doc/manuals/Substitute.am
--- squid-4.0.7/doc/manuals/Substitute.am 2016-02-24 06:47:50.000000000 +1300
+++ squid-4.0.8/doc/manuals/Substitute.am 2016-04-02 10:04:07.000000000 +1300
@@ -11,6 +11,8 @@
SUBSTITUTE=sed "\
s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\
s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\
+ s%@DEFAULT_SSL_CRTD@%$(DEFAULT_SSL_CRTD)%g;\
+ s%@DEFAULT_SSL_DB_DIR@%$(DEFAULT_SSL_DB_DIR)%g;\
s%@""PACKAGE_STRING""@%$(PACKAGE_STRING)%g;\
s%@SYSCONFDIR@%$(sysconfdir)%g;\
"
diff -u -r -N squid-4.0.7/doc/release-notes/release-4.html squid-4.0.8/doc/release-notes/release-4.html
--- squid-4.0.7/doc/release-notes/release-4.html 2016-02-24 07:38:32.000000000 +1300
+++ squid-4.0.8/doc/release-notes/release-4.html 2016-04-02 11:47:00.000000000 +1300
@@ -2,10 +2,10 @@
- Squid 4.0.7 release notes
+ Squid 4.0.8 release notes
-Squid 4.0.7 release notes
+Squid 4.0.8 release notes
Squid Developers
@@ -30,6 +30,7 @@
2.4 Helper Binary Changes
2.5 Secure ICAP
2.6 Improved SMP support
+2.7 Improved process management
@@ -60,7 +61,7 @@
-The Squid Team are pleased to announce the release of Squid-4.0.7 for testing.
+The Squid Team are pleased to announce the release of Squid-4.0.8 for testing.
This new release is available for download from
http://www.squid-cache.org/Versions/v4/ or the
mirrors.
@@ -101,6 +102,7 @@
Helper Binary Changes
Secure ICAP
Improved SMP support
+Improved process management
Most user-facing changes are reflected in squid.conf (see below).
@@ -215,6 +217,29 @@
enables Rock storage on more systems by default than previously.
+
+
+Squid is traditionally refered to as a daemon. But is actually a combination
+of daemon and daemon manager processes. This has caused significant problems
+integrating it with other third-party daemon managers.
+
+The Squid process which places its PID into the squid.pid file has always
+been the process to which control signals are sent. The manager process is
+now taking on signal handling instead of the main daemon process. Enabling
+integration with daemon managers such as Upstart or systemd which assume the
+process they initiated is the daemon with a PID to control.
+
+The squid binary now has a new --foreground command line option
+which prevents the process from exiting early while background workers
+continue their processing. When run with this option Squid will now wait
+for the worker(s) to finish before exiting. Unlike the old -N option
+--foreground supports SMP workers and multi-process features.
+--foreground is particularly useful for use with -z (disk
+cache structures creation), as it allows the caller to wait until Squid has
+finished.
+
+
There have been changes to Squid's configuration file since Squid-3.5.
@@ -236,6 +261,25 @@
+- collapsed_forwarding_shared_entries_limit
-
+
New directive to limit the size of a table used for sharing information
+about collapsible entries among SMP workers.
+
+ - reply_header_add
-
+
New directive to add header fields to outgoing HTTP responses to
+the client.
+
+ - server_pconn_for_nonretriable
-
+
New directive to provide fine-grained control over persistent connection
+reuse when forwarding HTTP requests that Squid cannot retry. It is useful
+in environments where opening new connections is very expensive
+and race conditions associated with persistent connections are very rare
+and/or only cause minor problems.
+
+ - shared_memory_locking
-
+
New directive to ensure shared memory is all available immediately
+on startup. Protects against SIGBUS errors, but delays startup.
+
- tls_outgoing_options
-
New directive to define TLS security context options for outgoing
connections. For example to HTTPS servers.
diff -u -r -N squid-4.0.7/include/version.h squid-4.0.8/include/version.h
--- squid-4.0.7/include/version.h 2016-02-24 06:49:58.000000000 +1300
+++ squid-4.0.8/include/version.h 2016-04-02 10:08:39.000000000 +1300
@@ -7,7 +7,7 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1456249662
+#define SQUID_RELEASE_TIME 1459544634
#endif
/*
diff -u -r -N squid-4.0.7/lib/libTrie/Makefile.in squid-4.0.8/lib/libTrie/Makefile.in
--- squid-4.0.7/lib/libTrie/Makefile.in 2016-02-24 06:49:01.000000000 +1300
+++ squid-4.0.8/lib/libTrie/Makefile.in 2016-04-02 10:06:17.000000000 +1300
@@ -734,6 +734,25 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+DEFAULT_HTTP_PORT = 3128
+DEFAULT_ICP_PORT = 3130
+DEFAULT_PREFIX = $(prefix)
+DEFAULT_CONFIG_DIR = $(sysconfdir)
+DEFAULT_CONFIG_FILE = $(DEFAULT_CONFIG_DIR)/squid.conf
+DEFAULT_MIME_TABLE = $(DEFAULT_CONFIG_DIR)/mime.conf
+DEFAULT_SSL_CRTD = $(libexecdir)/`echo security_file_certgen | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
+DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+DEFAULT_SSL_DB_DIR = $(DEFAULT_SWAP_DIR)/ssl_db
+DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_ICON_DIR = $(datadir)/icons
+DEFAULT_ERROR_DIR = $(datadir)/errors
AM_CFLAGS = $(SQUID_CFLAGS)
AM_CXXFLAGS = $(SQUID_CXXFLAGS)
CLEANFILES = testHeaders
diff -u -r -N squid-4.0.7/lib/libTrie/test/Makefile.in squid-4.0.8/lib/libTrie/test/Makefile.in
--- squid-4.0.7/lib/libTrie/test/Makefile.in 2016-02-24 06:49:01.000000000 +1300
+++ squid-4.0.8/lib/libTrie/test/Makefile.in 2016-04-02 10:06:18.000000000 +1300
@@ -665,6 +665,25 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+DEFAULT_HTTP_PORT = 3128
+DEFAULT_ICP_PORT = 3130
+DEFAULT_PREFIX = $(prefix)
+DEFAULT_CONFIG_DIR = $(sysconfdir)
+DEFAULT_CONFIG_FILE = $(DEFAULT_CONFIG_DIR)/squid.conf
+DEFAULT_MIME_TABLE = $(DEFAULT_CONFIG_DIR)/mime.conf
+DEFAULT_SSL_CRTD = $(libexecdir)/`echo security_file_certgen | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
+DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+DEFAULT_SSL_DB_DIR = $(DEFAULT_SWAP_DIR)/ssl_db
+DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_ICON_DIR = $(datadir)/icons
+DEFAULT_ERROR_DIR = $(datadir)/errors
AM_CFLAGS = $(SQUID_CFLAGS)
AM_CXXFLAGS = $(SQUID_CXXFLAGS)
CLEANFILES =
diff -u -r -N squid-4.0.7/lib/Makefile.in squid-4.0.8/lib/Makefile.in
--- squid-4.0.7/lib/Makefile.in 2016-02-24 06:49:00.000000000 +1300
+++ squid-4.0.8/lib/Makefile.in 2016-04-02 10:06:16.000000000 +1300
@@ -772,6 +772,25 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+DEFAULT_HTTP_PORT = 3128
+DEFAULT_ICP_PORT = 3130
+DEFAULT_PREFIX = $(prefix)
+DEFAULT_CONFIG_DIR = $(sysconfdir)
+DEFAULT_CONFIG_FILE = $(DEFAULT_CONFIG_DIR)/squid.conf
+DEFAULT_MIME_TABLE = $(DEFAULT_CONFIG_DIR)/mime.conf
+DEFAULT_SSL_CRTD = $(libexecdir)/`echo security_file_certgen | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
+DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+DEFAULT_SSL_DB_DIR = $(DEFAULT_SWAP_DIR)/ssl_db
+DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_ICON_DIR = $(datadir)/icons
+DEFAULT_ERROR_DIR = $(datadir)/errors
AM_CFLAGS = $(SQUID_CFLAGS)
AM_CXXFLAGS = $(SQUID_CXXFLAGS)
CLEANFILES = testHeaders
diff -u -r -N squid-4.0.7/lib/ntlmauth/Makefile.in squid-4.0.8/lib/ntlmauth/Makefile.in
--- squid-4.0.7/lib/ntlmauth/Makefile.in 2016-02-24 06:49:02.000000000 +1300
+++ squid-4.0.8/lib/ntlmauth/Makefile.in 2016-04-02 10:06:19.000000000 +1300
@@ -685,6 +685,25 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+DEFAULT_HTTP_PORT = 3128
+DEFAULT_ICP_PORT = 3130
+DEFAULT_PREFIX = $(prefix)
+DEFAULT_CONFIG_DIR = $(sysconfdir)
+DEFAULT_CONFIG_FILE = $(DEFAULT_CONFIG_DIR)/squid.conf
+DEFAULT_MIME_TABLE = $(DEFAULT_CONFIG_DIR)/mime.conf
+DEFAULT_SSL_CRTD = $(libexecdir)/`echo security_file_certgen | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
+DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+DEFAULT_SSL_DB_DIR = $(DEFAULT_SWAP_DIR)/ssl_db
+DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_ICON_DIR = $(datadir)/icons
+DEFAULT_ERROR_DIR = $(datadir)/errors
AM_CFLAGS = $(SQUID_CFLAGS)
AM_CXXFLAGS = $(SQUID_CXXFLAGS)
CLEANFILES = testHeaders
diff -u -r -N squid-4.0.7/lib/profiler/Makefile.in squid-4.0.8/lib/profiler/Makefile.in
--- squid-4.0.7/lib/profiler/Makefile.in 2016-02-24 06:49:02.000000000 +1300
+++ squid-4.0.8/lib/profiler/Makefile.in 2016-04-02 10:06:19.000000000 +1300
@@ -689,6 +689,25 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+DEFAULT_HTTP_PORT = 3128
+DEFAULT_ICP_PORT = 3130
+DEFAULT_PREFIX = $(prefix)
+DEFAULT_CONFIG_DIR = $(sysconfdir)
+DEFAULT_CONFIG_FILE = $(DEFAULT_CONFIG_DIR)/squid.conf
+DEFAULT_MIME_TABLE = $(DEFAULT_CONFIG_DIR)/mime.conf
+DEFAULT_SSL_CRTD = $(libexecdir)/`echo security_file_certgen | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
+DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+DEFAULT_SSL_DB_DIR = $(DEFAULT_SWAP_DIR)/ssl_db
+DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_ICON_DIR = $(datadir)/icons
+DEFAULT_ERROR_DIR = $(datadir)/errors
AM_CFLAGS = $(SQUID_CFLAGS)
AM_CXXFLAGS = $(SQUID_CXXFLAGS)
CLEANFILES = testHeaders
diff -u -r -N squid-4.0.7/lib/rfcnb/Makefile.in squid-4.0.8/lib/rfcnb/Makefile.in
--- squid-4.0.7/lib/rfcnb/Makefile.in 2016-02-24 06:49:03.000000000 +1300
+++ squid-4.0.8/lib/rfcnb/Makefile.in 2016-04-02 10:06:20.000000000 +1300
@@ -665,6 +665,25 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+DEFAULT_HTTP_PORT = 3128
+DEFAULT_ICP_PORT = 3130
+DEFAULT_PREFIX = $(prefix)
+DEFAULT_CONFIG_DIR = $(sysconfdir)
+DEFAULT_CONFIG_FILE = $(DEFAULT_CONFIG_DIR)/squid.conf
+DEFAULT_MIME_TABLE = $(DEFAULT_CONFIG_DIR)/mime.conf
+DEFAULT_SSL_CRTD = $(libexecdir)/`echo security_file_certgen | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
+DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+DEFAULT_SSL_DB_DIR = $(DEFAULT_SWAP_DIR)/ssl_db
+DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_ICON_DIR = $(datadir)/icons
+DEFAULT_ERROR_DIR = $(datadir)/errors
AM_CFLAGS = $(SQUID_CFLAGS)
AM_CXXFLAGS = $(SQUID_CXXFLAGS)
CLEANFILES =
diff -u -r -N squid-4.0.7/lib/smblib/Makefile.in squid-4.0.8/lib/smblib/Makefile.in
--- squid-4.0.7/lib/smblib/Makefile.in 2016-02-24 06:49:03.000000000 +1300
+++ squid-4.0.8/lib/smblib/Makefile.in 2016-04-02 10:06:21.000000000 +1300
@@ -666,6 +666,25 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+DEFAULT_HTTP_PORT = 3128
+DEFAULT_ICP_PORT = 3130
+DEFAULT_PREFIX = $(prefix)
+DEFAULT_CONFIG_DIR = $(sysconfdir)
+DEFAULT_CONFIG_FILE = $(DEFAULT_CONFIG_DIR)/squid.conf
+DEFAULT_MIME_TABLE = $(DEFAULT_CONFIG_DIR)/mime.conf
+DEFAULT_SSL_CRTD = $(libexecdir)/`echo security_file_certgen | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR)
+DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
+DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
+DEFAULT_NETDB_FILE = $(DEFAULT_SWAP_DIR)/netdb.state
+DEFAULT_SSL_DB_DIR = $(DEFAULT_SWAP_DIR)/ssl_db
+DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_ICON_DIR = $(datadir)/icons
+DEFAULT_ERROR_DIR = $(datadir)/errors
AM_CFLAGS = $(SQUID_CFLAGS)
AM_CXXFLAGS = $(SQUID_CXXFLAGS)
CLEANFILES =
diff -u -r -N squid-4.0.7/RELEASENOTES.html squid-4.0.8/RELEASENOTES.html
--- squid-4.0.7/RELEASENOTES.html 2016-02-24 07:38:32.000000000 +1300
+++ squid-4.0.8/RELEASENOTES.html 2016-04-02 11:47:00.000000000 +1300
@@ -2,10 +2,10 @@
- Squid 4.0.7 release notes
+ Squid 4.0.8 release notes
-Squid 4.0.7 release notes
+Squid 4.0.8 release notes
Squid Developers
@@ -30,6 +30,7 @@
- 2.4 Helper Binary Changes
- 2.5 Secure ICAP
- 2.6 Improved SMP support
+
- 2.7 Improved process management
@@ -60,7 +61,7 @@
-The Squid Team are pleased to announce the release of Squid-4.0.7 for testing.
+The Squid Team are pleased to announce the release of Squid-4.0.8 for testing.
This new release is available for download from
http://www.squid-cache.org/Versions/v4/ or the
mirrors.
@@ -101,6 +102,7 @@
- Helper Binary Changes
- Secure ICAP
- Improved SMP support
+- Improved process management
Most user-facing changes are reflected in squid.conf (see below).
@@ -215,6 +217,29 @@
enables Rock storage on more systems by default than previously.
+
+
+Squid is traditionally refered to as a daemon. But is actually a combination
+of daemon and daemon manager processes. This has caused significant problems
+integrating it with other third-party daemon managers.
+
+The Squid process which places its PID into the squid.pid file has always
+been the process to which control signals are sent. The manager process is
+now taking on signal handling instead of the main daemon process. Enabling
+integration with daemon managers such as Upstart or systemd which assume the
+process they initiated is the daemon with a PID to control.
+
+The squid binary now has a new --foreground command line option
+which prevents the process from exiting early while background workers
+continue their processing. When run with this option Squid will now wait
+for the worker(s) to finish before exiting. Unlike the old -N option
+--foreground supports SMP workers and multi-process features.
+--foreground is particularly useful for use with -z (disk
+cache structures creation), as it allows the caller to wait until Squid has
+finished.
+
+
There have been changes to Squid's configuration file since Squid-3.5.
@@ -236,6 +261,25 @@
+- collapsed_forwarding_shared_entries_limit
-
+
New directive to limit the size of a table used for sharing information
+about collapsible entries among SMP workers.
+
+ - reply_header_add
-
+
New directive to add header fields to outgoing HTTP responses to
+the client.
+
+ - server_pconn_for_nonretriable
-
+
New directive to provide fine-grained control over persistent connection
+reuse when forwarding HTTP requests that Squid cannot retry. It is useful
+in environments where opening new connections is very expensive
+and race conditions associated with persistent connections are very rare
+and/or only cause minor problems.
+
+ - shared_memory_locking
-
+
New directive to ensure shared memory is all available immediately
+on startup. Protects against SIGBUS errors, but delays startup.
+
- tls_outgoing_options
-
New directive to define TLS security context options for outgoing
connections. For example to HTTPS servers.
diff -u -r -N squid-4.0.7/SPONSORS squid-4.0.8/SPONSORS
--- squid-4.0.7/SPONSORS 2016-02-24 06:49:57.000000000 +1300
+++ squid-4.0.8/SPONSORS 2016-04-02 10:08:35.000000000 +1300
@@ -7,6 +7,11 @@
Augur TBBS has funded development work towards HTTP/2 support in
Squid-4.
+Bloomberg L.P.
+
+ Bloomberg L.P. has funded development work towards stabilizing
+ Squid-4.
+
LaunchPad - http://launchpad.net/
Provide Bazaar mirroring services and host the Squid-3+ developer
diff -u -r -N squid-4.0.7/src/AccessLogEntry.cc squid-4.0.8/src/AccessLogEntry.cc
--- squid-4.0.7/src/AccessLogEntry.cc 2016-02-24 06:47:50.000000000 +1300
+++ squid-4.0.8/src/AccessLogEntry.cc 2016-04-02 10:04:07.000000000 +1300
@@ -76,7 +76,6 @@
HTTPMSGUNLOCK(adapted_request);
safe_free(lastAclName);
- safe_free(lastAclData);
HTTPMSGUNLOCK(reply);
HTTPMSGUNLOCK(request);
diff -u -r -N squid-4.0.7/src/AccessLogEntry.h squid-4.0.8/src/AccessLogEntry.h
--- squid-4.0.7/src/AccessLogEntry.h 2016-02-24 06:47:50.000000000 +1300
+++ squid-4.0.8/src/AccessLogEntry.h 2016-04-02 10:04:07.000000000 +1300
@@ -21,6 +21,7 @@
#include "LogTags.h"
#include "MessageSizes.h"
#include "Notes.h"
+#include "sbuf/SBuf.h"
#if ICAP_CLIENT
#include "adaptation/icap/Elements.h"
#endif
@@ -42,7 +43,6 @@
AccessLogEntry() :
url(nullptr),
lastAclName(nullptr),
- lastAclData(nullptr),
reply(nullptr),
request(nullptr),
adapted_request(nullptr)
@@ -57,7 +57,7 @@
/// Fetch the transaction method string (ICP opcode, HTCP opcode or HTTP method)
SBuf getLogMethod() const;
- const char *url;
+ SBuf url;
/// TCP/IP level details about the client connection
Comm::ConnectionPointer tcpClient;
@@ -207,7 +207,7 @@
#endif
const char *lastAclName; ///< string for external_acl_type %ACL format code
- const char *lastAclData; ///< string for external_acl_type %DATA format code
+ SBuf lastAclData; ///< string for external_acl_type %DATA format code
HierarchyLogEntry hier;
HttpReply *reply;
diff -u -r -N squid-4.0.7/src/acl/Acl.h squid-4.0.8/src/acl/Acl.h
--- squid-4.0.7/src/acl/Acl.h 2016-02-24 06:47:50.000000000 +1300
+++ squid-4.0.8/src/acl/Acl.h 2016-04-02 10:04:07.000000000 +1300
@@ -14,7 +14,7 @@
#include "cbdata.h"
#include "defines.h"
#include "dlink.h"
-#include "SBufList.h"
+#include "sbuf/List.h"
#include