Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2018-10-04 19:02:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid" Thu Oct 4 19:02:24 2018 rev:63 rq:639903 version:4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2018-08-15 10:36:36.812096855 +0200 +++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2018-10-04 19:02:33.263136518 +0200 @@ -1,0 +2,21 @@ +Thu Oct 4 07:36:49 UTC 2018 - Martin Pluskal <[email protected]> + +- Correct changelog +- Enable tests + +------------------------------------------------------------------- +Tue Oct 02 10:16:22 UTC 2018 - [email protected] + +- New upstream stable version 4.3: + * Bug 4885: Excessive memory usage when running out of descriptors + * Bug 4877: Add missing text about external_acl_type %DATA changes + * Bug 4875 pt1: GCC-8 compile errors with -O3 optimization + * Bug 4716: Blank lines in cachemgr.conf are not skipped + * Bug 4691: balance_on_multiple_ip config option docs + * basic_pop3_auth: fix startup errors + * langpack: Add missing dialect aliases + * Fix range_offset_limit debugging + * Fix icc build errors + * Update systemd dependencies in squid.service + +------------------------------------------------------------------- Old: ---- squid-4.2.tar.xz squid-4.2.tar.xz.asc New: ---- squid-4.3.tar.xz squid-4.3.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.dCSP6m/_old 2018-10-04 19:02:33.791135962 +0200 +++ /var/tmp/diff_new_pack.dCSP6m/_new 2018-10-04 19:02:33.791135962 +0200 @@ -12,19 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define squidlibdir %{_libdir}/squid %define squidconfdir %{_sysconfdir}/squid Name: squid -Version: 4.2 +Version: 4.3 Release: 0 Summary: Caching and forwarding HTTP web proxy License: GPL-2.0-or-later Group: Productivity/Networking/Web/Proxy -Url: http://www.squid-cache.org +URL: http://www.squid-cache.org Source0: http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz Source1: http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz.asc Source5: pam.squid @@ -186,6 +186,10 @@ mv %{buildroot}%{_datadir}/squid/mib.txt \ %{buildroot}%{_datadir}/snmp/mibs/SQUID-MIB.txt +%check +# Fails in chroot environment +make %{?_smp_mflags} check + %pre # we need this group for /usr/sbin/pinger if [[ -z $(%{_bindir}/getent group %{name} 2>/dev/null) ]]; then @@ -240,7 +244,6 @@ %service_del_postun squid.service %files -%defattr(-,root,root) %license COPYING %doc ChangeLog CONTRIBUTORS CREDITS %doc QUICKSTART README RELEASENOTES.html SPONSORS* ++++++ squid-4.2.tar.xz -> squid-4.3.tar.xz ++++++ ++++ 19314 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/ChangeLog new/squid-4.3/ChangeLog --- old/squid-4.2/ChangeLog 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/ChangeLog 2018-09-30 20:57:54.000000000 +0200 @@ -1,3 +1,16 @@ +Changes to squid-4.3 (01 Oct 2018): + + - Bug 4885: Excessive memory usage when running out of descriptors + - Bug 4877: Add missing text about external_acl_type %DATA changes + - Bug 4875 pt1: GCC-8 compile errors with -O3 optimization + - Bug 4716: Blank lines in cachemgr.conf are not skipped + - Bug 4691: balance_on_multiple_ip config option docs + - basic_pop3_auth: fix startup errors + - langpack: Add missing dialect aliases + - Fix range_offset_limit debugging + - Fix icc build errors + - Update systemd dependencies in squid.service + Changes to squid-4.2 (04 Aug 2018): - Regression fix: support for https_port clientca= option diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/RELEASENOTES.html new/squid-4.3/RELEASENOTES.html --- old/squid-4.2/RELEASENOTES.html 2018-08-05 16:42:39.000000000 +0200 +++ new/squid-4.3/RELEASENOTES.html 2018-09-30 21:34:31.000000000 +0200 @@ -1,11 +1,11 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <HTML> <HEAD> - <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.72"> - <TITLE>Squid 4.2 release notes</TITLE> + <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.73"> + <TITLE>Squid 4.3 release notes</TITLE> </HEAD> <BODY> -<H1>Squid 4.2 release notes</H1> +<H1>Squid 4.3 release notes</H1> <H2>Squid Developers</H2> <HR> @@ -63,7 +63,7 @@ <HR> <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2> -<P>The Squid Team are pleased to announce the release of Squid-4.2 for testing.</P> +<P>The Squid Team are pleased to announce the release of Squid-4.3 for testing.</P> <P>This new release is available for download from <A HREF="http://www.squid-cache.org/Versions/v4/";>http://www.squid-cache.org/Versions/v4/</A> or the <A HREF="http://www.squid-cache.org/Download/http-mirrors.html";>mirrors</A>.</P> @@ -421,6 +421,8 @@ <P>New parameter <EM>on-persistent-overload=</EM> to set the action taken when the helper queue is overloaded.</P> <P>Format field updated to accept any logformat %macro code.</P> +<P>The optional <EM>acl-value</EM> fields in this helper input now expand +to a dash ('-') if the %DATA macro is not specified explicitly.</P> <DT><B>http_port</B><DD> <P>New option <EM>tls-min-version=1.N</EM> to set minimum TLS version allowed.</P> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/cfgaux/compile new/squid-4.3/cfgaux/compile --- old/squid-4.2/cfgaux/compile 2018-08-05 16:31:38.000000000 +0200 +++ new/squid-4.3/cfgaux/compile 2018-09-30 21:21:54.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/cfgaux/missing new/squid-4.3/cfgaux/missing --- old/squid-4.2/cfgaux/missing 2018-08-05 16:31:38.000000000 +0200 +++ new/squid-4.3/cfgaux/missing 2018-09-30 21:21:54.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/cfgaux/test-driver new/squid-4.3/cfgaux/test-driver --- old/squid-4.2/cfgaux/test-driver 2018-08-05 16:31:43.000000000 +0200 +++ new/squid-4.3/cfgaux/test-driver 2018-09-30 21:22:00.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -140,9 +140,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/configure.ac new/squid-4.3/configure.ac --- old/squid-4.2/configure.ac 2018-08-05 16:31:44.000000000 +0200 +++ new/squid-4.3/configure.ac 2018-09-30 21:22:02.000000000 +0200 @@ -5,7 +5,7 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -AC_INIT([Squid Web Proxy],[4.2],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[4.3],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/doc/release-notes/release-4.html new/squid-4.3/doc/release-notes/release-4.html --- old/squid-4.2/doc/release-notes/release-4.html 2018-08-05 16:42:39.000000000 +0200 +++ new/squid-4.3/doc/release-notes/release-4.html 2018-09-30 21:34:31.000000000 +0200 @@ -1,11 +1,11 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> <HTML> <HEAD> - <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.72"> - <TITLE>Squid 4.2 release notes</TITLE> + <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.73"> + <TITLE>Squid 4.3 release notes</TITLE> </HEAD> <BODY> -<H1>Squid 4.2 release notes</H1> +<H1>Squid 4.3 release notes</H1> <H2>Squid Developers</H2> <HR> @@ -63,7 +63,7 @@ <HR> <H2><A NAME="s1">1.</A> <A HREF="#toc1">Notice</A></H2> -<P>The Squid Team are pleased to announce the release of Squid-4.2 for testing.</P> +<P>The Squid Team are pleased to announce the release of Squid-4.3 for testing.</P> <P>This new release is available for download from <A HREF="http://www.squid-cache.org/Versions/v4/";>http://www.squid-cache.org/Versions/v4/</A> or the <A HREF="http://www.squid-cache.org/Download/http-mirrors.html";>mirrors</A>.</P> @@ -421,6 +421,8 @@ <P>New parameter <EM>on-persistent-overload=</EM> to set the action taken when the helper queue is overloaded.</P> <P>Format field updated to accept any logformat %macro code.</P> +<P>The optional <EM>acl-value</EM> fields in this helper input now expand +to a dash ('-') if the %DATA macro is not specified explicitly.</P> <DT><B>http_port</B><DD> <P>New option <EM>tls-min-version=1.N</EM> to set minimum TLS version allowed.</P> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/errors/aliases new/squid-4.3/errors/aliases --- old/squid-4.2/errors/aliases 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/errors/aliases 2018-09-30 20:57:54.000000000 +0200 @@ -8,12 +8,13 @@ ar ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb ar-ly ar-ma ar-om ar-qa ar-sa ar-sy ar-tn ar-ye az az-az bg bg-bg +ca ca-es cs cs-cz da da-dk de de-at de-ch de-de de-li de-lu el el-gr -en en-au en-bz en-ca en-gb en-ie en-in en-jm en-nz en-ph en-sg en-tt en-uk en-us en-za en-zw -es es-ar es-bo es-cl es-co es-cr es-do es-ec es-es es-gt es-hn es-mx es-ni es-pa es-pe es-pr es-py es-sv es-us es-uy es-ve +en en-au en-bz en-ca en-cn en-gb en-ie en-in en-jm en-nz en-ph en-sg en-tt en-uk en-us en-za en-zw +es es-ar es-bo es-cl es-co es-cr es-do es-ec es-es es-gt es-hn es-mx es-ni es-pa es-pe es-pr es-py es-sv es-us es-uy es-ve es-xl et et-ee fa fa-fa fa-ir fi fi-fi @@ -32,7 +33,7 @@ nl nl-nl pl pl-pl pt pt-pt -pt-br pt-bz +pt-br pt-bz pt-xl ro ro-ro ro-md ru ru-ru sk sk-sk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/include/version.h new/squid-4.3/include/version.h --- old/squid-4.2/include/version.h 2018-08-05 16:31:44.000000000 +0200 +++ new/squid-4.3/include/version.h 2018-09-30 21:22:02.000000000 +0200 @@ -7,7 +7,7 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1533479491 +#define SQUID_RELEASE_TIME 1538335308 #endif /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/libltdl/m4/libtool.m4 new/squid-4.3/libltdl/m4/libtool.m4 --- old/squid-4.2/libltdl/m4/libtool.m4 2018-08-05 16:31:36.000000000 +0200 +++ new/squid-4.3/libltdl/m4/libtool.m4 2018-09-30 21:21:52.000000000 +0200 @@ -6438,7 +6438,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -6813,7 +6813,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6878,7 +6878,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -7217,7 +7217,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -7301,7 +7301,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7312,7 +7312,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/HttpRequest.cc new/squid-4.3/src/HttpRequest.cc --- old/squid-4.2/src/HttpRequest.cc 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/HttpRequest.cc 2018-09-30 20:57:54.000000000 +0200 @@ -611,8 +611,8 @@ for (AclSizeLimit *l = Config.rangeOffsetLimit; l; l = l -> next) { /* if there is no ACL list or if the ACLs listed match use this limit value */ if (!l->aclList || ch.fastCheck(l->aclList).allowed()) { - debugs(58, 4, HERE << "rangeOffsetLimit=" << rangeOffsetLimit); rangeOffsetLimit = l->size; // may be -1 + debugs(58, 4, rangeOffsetLimit); break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/SquidConfig.h new/squid-4.3/src/SquidConfig.h --- old/squid-4.2/src/SquidConfig.h 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/SquidConfig.h 2018-09-30 20:57:54.000000000 +0200 @@ -314,7 +314,6 @@ int surrogate_is_remote; int request_entities; int detect_broken_server_pconns; - int balance_on_multiple_ip; int relaxed_header_parser; int check_hostnames; int allow_underscore; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/SquidNew.cc new/squid-4.3/src/SquidNew.cc --- old/squid-4.2/src/SquidNew.cc 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/SquidNew.cc 2018-09-30 20:57:54.000000000 +0200 @@ -22,31 +22,6 @@ { xfree(address); } -void *operator new[](size_t size) -{ - return xmalloc(size); -} -void operator delete[](void *address) -{ - xfree(address); -} - -void *operator new(size_t size, const std::nothrow_t &tag) -{ - return xmalloc(size); -} -void operator delete(void *address, const std::nothrow_t &tag) -{ - xfree(address); -} -void *operator new[](size_t size, const std::nothrow_t &tag) -{ - return xmalloc(size); -} -void operator delete[](void *address, const std::nothrow_t &tag) -{ - xfree(address); -} #endif /* !defined(__clang__) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/String.cc new/squid-4.3/src/String.cc --- old/squid-4.2/src/String.cc 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/String.cc 2018-09-30 20:57:54.000000000 +0200 @@ -164,8 +164,8 @@ assert(str && len >= 0); PROF_start(StringAppend); - if (len_ + len < size_) { - strncat(buf_, str, len); + if (len_ + len + 1 /*'\0'*/ < size_) { + xstrncpy(buf_+len_, str, len+1); len_ += len; } else { // Create a temporary string and absorb it later. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/acl/external/SQL_session/ext_sql_session_acl.8 new/squid-4.3/src/acl/external/SQL_session/ext_sql_session_acl.8 --- old/squid-4.2/src/acl/external/SQL_session/ext_sql_session_acl.8 2018-08-05 16:42:41.000000000 +0200 +++ new/squid-4.3/src/acl/external/SQL_session/ext_sql_session_acl.8 2018-09-30 21:34:34.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "EXT_SQL_SESSION_ACL 8" -.TH EXT_SQL_SESSION_ACL 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH EXT_SQL_SESSION_ACL 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/acl/external/delayer/ext_delayer_acl.8 new/squid-4.3/src/acl/external/delayer/ext_delayer_acl.8 --- old/squid-4.2/src/acl/external/delayer/ext_delayer_acl.8 2018-08-05 16:42:41.000000000 +0200 +++ new/squid-4.3/src/acl/external/delayer/ext_delayer_acl.8 2018-09-30 21:34:33.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "EXT_DELAYER_ACL 8" -.TH EXT_DELAYER_ACL 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH EXT_DELAYER_ACL 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 new/squid-4.3/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 --- old/squid-4.2/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2018-08-05 16:42:41.000000000 +0200 +++ new/squid-4.3/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.8 2018-09-30 21:34:34.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "EXT_WBINFO_GROUP_ACL 8" -.TH EXT_WBINFO_GROUP_ACL 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH EXT_WBINFO_GROUP_ACL 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/anyp/Uri.cc new/squid-4.3/src/anyp/Uri.cc --- old/squid-4.2/src/anyp/Uri.cc 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/anyp/Uri.cc 2018-09-30 20:57:54.000000000 +0200 @@ -945,7 +945,7 @@ switch (Config.uri_whitespace) { case URI_WHITESPACE_ALLOW: flags |= RFC1738_ESCAPE_NOSPACE; - // fall through to next case + // fall through to next case case URI_WHITESPACE_ENCODE: flags |= RFC1738_ESCAPE_UNESCAPED; cleanedUri = xstrndup(rfc1738_do_escape(uri, flags), MAX_URL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/auth/basic/DB/basic_db_auth.8 new/squid-4.3/src/auth/basic/DB/basic_db_auth.8 --- old/squid-4.2/src/auth/basic/DB/basic_db_auth.8 2018-08-05 16:42:42.000000000 +0200 +++ new/squid-4.3/src/auth/basic/DB/basic_db_auth.8 2018-09-30 21:34:34.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "BASIC_DB_AUTH 8" -.TH BASIC_DB_AUTH 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH BASIC_DB_AUTH 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/auth/basic/POP3/basic_pop3_auth.8 new/squid-4.3/src/auth/basic/POP3/basic_pop3_auth.8 --- old/squid-4.2/src/auth/basic/POP3/basic_pop3_auth.8 2018-08-05 16:42:42.000000000 +0200 +++ new/squid-4.3/src/auth/basic/POP3/basic_pop3_auth.8 2018-09-30 21:34:35.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "BASIC_POP3_AUTH 8" -.TH BASIC_POP3_AUTH 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH BASIC_POP3_AUTH 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/auth/basic/POP3/basic_pop3_auth.pl.in new/squid-4.3/src/auth/basic/POP3/basic_pop3_auth.pl.in --- old/squid-4.2/src/auth/basic/POP3/basic_pop3_auth.pl.in 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/auth/basic/POP3/basic_pop3_auth.pl.in 2018-09-30 20:57:54.000000000 +0200 @@ -89,14 +89,14 @@ exit 1 } -$server = shift @ARGV; +my $server = shift @ARGV; while(<>) { my ($username, $password) = split(/\s+/); $username =~ s/%([0-9a-f][0-9a-f])/pack("H2",$1)/gie; $password =~ s/%([0-9a-f][0-9a-f])/pack("H2",$1)/gie; - $pop = Net::POP3->new($server); + my $pop = Net::POP3->new($server); if (!$pop) { print "ERR Server not responding\n"; next; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/cf.data.pre new/squid-4.3/src/cf.data.pre --- old/squid-4.2/src/cf.data.pre 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/cf.data.pre 2018-09-30 20:57:54.000000000 +0200 @@ -252,6 +252,12 @@ DOC_END # Options Removed in 3.2 +NAME: balance_on_multiple_ip +TYPE: obsolete +DOC_START + Remove this line. Squid performs a 'Happy Eyeballs' algorithm, this multiple-IP algorithm is not longer relevant. +DOC_END + NAME: chunked_request_body_max_size TYPE: obsolete DOC_START @@ -879,6 +885,8 @@ If you do not specify a DATA macro inside FORMAT, Squid automatically appends %DATA to your FORMAT. + Note that Squid-3.x may expand %DATA to whitespace + or nothing in this case. By default, Squid applies URL-encoding to each ACL argument inside the argument string. If an explicit @@ -9914,22 +9922,6 @@ get an error saying that Squid can not open the port. DOC_END -NAME: balance_on_multiple_ip -TYPE: onoff -LOC: Config.onoff.balance_on_multiple_ip -DEFAULT: off -DOC_START - Modern IP resolvers in squid sort lookup results by preferred access. - By default squid will use these IP in order and only rotates to - the next listed when the most preffered fails. - - Some load balancing servers based on round robin DNS have been - found not to preserve user session state across requests - to different IP addresses. - - Enabling this directive Squid rotates IP's per request. -DOC_END - NAME: pipeline_prefetch TYPE: pipelinePrefetch LOC: Config.pipeline_max_prefetch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/comm/AcceptLimiter.cc new/squid-4.3/src/comm/AcceptLimiter.cc --- old/squid-4.2/src/comm/AcceptLimiter.cc 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/comm/AcceptLimiter.cc 2018-09-30 20:57:54.000000000 +0200 @@ -24,42 +24,33 @@ void Comm::AcceptLimiter::defer(const Comm::TcpAcceptor::Pointer &afd) { - ++ (afd->isLimited); - debugs(5, 5, afd->conn << " x" << afd->isLimited); + debugs(5, 5, afd->conn << "; already queued: " << deferred_.size()); deferred_.push_back(afd); } void Comm::AcceptLimiter::removeDead(const Comm::TcpAcceptor::Pointer &afd) { - uint64_t abandonedClients = 0; - for (unsigned int i = 0; i < deferred_.size() && afd->isLimited > 0; ++i) { - if (deferred_[i] == afd) { - -- deferred_[i]->isLimited; - deferred_[i] = NULL; // fast. kick() will skip empty entries later. - debugs(5, 5, afd->conn << " x" << afd->isLimited); - ++abandonedClients; + for (auto it = deferred_.begin(); it != deferred_.end(); ++it) { + if (*it == afd) { + *it = nullptr; // fast. kick() will skip empty entries later. + debugs(5,4, "Abandoned client TCP SYN by closing socket: " << afd->conn); + return; } } - debugs(5,4, "Abandoned " << abandonedClients << " client TCP SYN by closing socket: " << afd->conn); + debugs(5,4, "Not found " << afd->conn << " in queue, size: " << deferred_.size()); } void Comm::AcceptLimiter::kick() { - // TODO: this could be optimized further with an iterator to search - // looking for first non-NULL, followed by dumping the first N - // with only one shift()/pop_front operation - // OR, by reimplementing as a list instead of Vector. - debugs(5, 5, "size=" << deferred_.size()); - while (deferred_.size() > 0 && fdNFree() >= RESERVED_FD) { + while (deferred_.size() > 0 && Comm::TcpAcceptor::okToAccept()) { /* NP: shift() is equivalent to pop_front(). Giving us a FIFO queue. */ TcpAcceptor::Pointer temp = deferred_.front(); deferred_.erase(deferred_.begin()); if (temp.valid()) { debugs(5, 5, "doing one."); - -- temp->isLimited; temp->acceptNext(); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/comm/AcceptLimiter.h new/squid-4.3/src/comm/AcceptLimiter.h --- old/squid-4.2/src/comm/AcceptLimiter.h 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/comm/AcceptLimiter.h 2018-09-30 20:57:54.000000000 +0200 @@ -11,7 +11,7 @@ #include "comm/TcpAcceptor.h" -#include <vector> +#include <deque> namespace Comm { @@ -26,16 +26,6 @@ * removeDead - used only by Comm layer ConnAcceptor to remove themselves when dying. * kick - used by Comm layer when FD are closed. */ -/* TODO this algorithm can be optimized further: - * - * 1) reduce overheads by only pushing one entry per port to the list? - * use TcpAcceptor::isLimited as a flag whether to re-list when kick()'ing - * or to NULL an entry while scanning the list for empty spaces. - * Side effect: TcpAcceptor->kick() becomes allowed to pull off multiple accept()'s in bunches - * - * 2) re-implement as a std::queue instead of std::vector - * storing head/tail pointers for fast push/pop and avoiding the whole shift() overhead - */ class AcceptLimiter { @@ -56,7 +46,7 @@ static AcceptLimiter Instance_; /** FIFO queue */ - std::vector<TcpAcceptor::Pointer> deferred_; + std::deque<TcpAcceptor::Pointer> deferred_; }; }; // namepace Comm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/comm/TcpAcceptor.cc new/squid-4.3/src/comm/TcpAcceptor.cc --- old/squid-4.2/src/comm/TcpAcceptor.cc 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/comm/TcpAcceptor.cc 2018-09-30 20:57:54.000000000 +0200 @@ -43,7 +43,6 @@ Comm::TcpAcceptor::TcpAcceptor(const Comm::ConnectionPointer &newConn, const char *, const Subscription::Pointer &aSub) : AsyncJob("Comm::TcpAcceptor"), errcode(0), - isLimited(0), theCallSub(aSub), conn(newConn), listenPort_() @@ -52,7 +51,6 @@ Comm::TcpAcceptor::TcpAcceptor(const AnyP::PortCfgPointer &p, const char *, const Subscription::Pointer &aSub) : AsyncJob("Comm::TcpAcceptor"), errcode(0), - isLimited(0), theCallSub(aSub), conn(p->listenConn), listenPort_(p) @@ -233,7 +231,6 @@ } else { afd->acceptNext(); } - SetSelect(fd, COMM_SELECT_READ, Comm::TcpAcceptor::doAccept, afd, 0); } catch (const std::exception &e) { fatalf("FATAL: error while accepting new client connection: %s\n", e.what()); @@ -310,6 +307,7 @@ " accepted new connection " << newConnDetails << " handler Subscription: " << theCallSub); notify(flag, newConnDetails); + SetSelect(conn->fd, COMM_SELECT_READ, doAccept, this, 0); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/comm/TcpAcceptor.h new/squid-4.3/src/comm/TcpAcceptor.h --- old/squid-4.2/src/comm/TcpAcceptor.h 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/comm/TcpAcceptor.h 2018-09-30 20:57:54.000000000 +0200 @@ -76,9 +76,12 @@ /// errno code of the last accept() or listen() action if one occurred. int errcode; + /// Method to test if there are enough file descriptors to open a new client connection + /// if not the accept() will be postponed + static bool okToAccept(); + protected: friend class AcceptLimiter; - int32_t isLimited; ///< whether this socket is delayed and on the AcceptLimiter queue. private: Subscription::Pointer theCallSub; ///< used to generate AsyncCalls handling our events. @@ -93,10 +96,6 @@ /// listen socket closure handler AsyncCall::Pointer closer_; - /// Method to test if there are enough file descriptors to open a new client connection - /// if not the accept() will be postponed - static bool okToAccept(); - /// Method callback for whenever an FD is ready to accept a client connection. static void doAccept(int fd, void *data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/http/url_rewriters/LFS/url_lfs_rewrite.8 new/squid-4.3/src/http/url_rewriters/LFS/url_lfs_rewrite.8 --- old/squid-4.2/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2018-08-05 16:42:43.000000000 +0200 +++ new/squid-4.3/src/http/url_rewriters/LFS/url_lfs_rewrite.8 2018-09-30 21:34:35.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "URL_LFS_REWRITE 8" -.TH URL_LFS_REWRITE 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH URL_LFS_REWRITE 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/log/DB/log_db_daemon.8 new/squid-4.3/src/log/DB/log_db_daemon.8 --- old/squid-4.2/src/log/DB/log_db_daemon.8 2018-08-05 16:42:43.000000000 +0200 +++ new/squid-4.3/src/log/DB/log_db_daemon.8 2018-09-30 21:34:36.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "LOG_DB_DAEMON 8" -.TH LOG_DB_DAEMON 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH LOG_DB_DAEMON 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/security/cert_validators/fake/security_fake_certverify.8 new/squid-4.3/src/security/cert_validators/fake/security_fake_certverify.8 --- old/squid-4.2/src/security/cert_validators/fake/security_fake_certverify.8 2018-08-05 16:42:44.000000000 +0200 +++ new/squid-4.3/src/security/cert_validators/fake/security_fake_certverify.8 2018-09-30 21:34:36.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "SECURITY_FAKE_CERTVERIFY 8" -.TH SECURITY_FAKE_CERTVERIFY 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH SECURITY_FAKE_CERTVERIFY 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/store/Controller.cc new/squid-4.3/src/store/Controller.cc --- old/squid-4.2/src/store/Controller.cc 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/src/store/Controller.cc 2018-09-30 20:57:54.000000000 +0200 @@ -671,13 +671,9 @@ if (!old->timestampsSet() && !modified) return; - /* update stored image of the old entry */ - - if (memStore && old->mem_status == IN_MEMORY && !EBIT_TEST(old->flags, ENTRY_SPECIAL)) - memStore->updateHeaders(old); - - if (old->hasDisk()) - swapDir->updateHeaders(old); + // XXX: Call memStore->updateHeaders(old) and swapDir->updateHeaders(old) to + // update stored headers, stored metadata, and in-transit metadata. + debugs(20, 3, *old << " headers were modified: " << modified); } bool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/src/store/id_rewriters/file/storeid_file_rewrite.8 new/squid-4.3/src/store/id_rewriters/file/storeid_file_rewrite.8 --- old/squid-4.2/src/store/id_rewriters/file/storeid_file_rewrite.8 2018-08-05 16:42:42.000000000 +0200 +++ new/squid-4.3/src/store/id_rewriters/file/storeid_file_rewrite.8 2018-09-30 21:34:34.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "STOREID_FILE_REWRITE 8" -.TH STOREID_FILE_REWRITE 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH STOREID_FILE_REWRITE 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/tools/cachemgr.cc new/squid-4.3/tools/cachemgr.cc --- old/squid-4.2/tools/cachemgr.cc 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/tools/cachemgr.cc 2018-09-30 20:57:54.000000000 +0200 @@ -294,7 +294,8 @@ while (fgets(config_line, BUFSIZ, fp)) { char *server, *comment; - strtok(config_line, "\r\n"); + if (strtok(config_line, "\r\n") == nullptr) + continue; if (config_line[0] == '#') continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/tools/helper-mux/helper-mux.8 new/squid-4.3/tools/helper-mux/helper-mux.8 --- old/squid-4.2/tools/helper-mux/helper-mux.8 2018-08-05 16:42:44.000000000 +0200 +++ new/squid-4.3/tools/helper-mux/helper-mux.8 2018-09-30 21:34:36.000000000 +0200 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "HELPER-MUX 8" -.TH HELPER-MUX 8 "2018-08-05" "perl v5.26.2" "User Contributed Perl Documentation" +.TH HELPER-MUX 8 "2018-09-30" "perl v5.26.2" "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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-4.2/tools/systemd/squid.service new/squid-4.3/tools/systemd/squid.service --- old/squid-4.2/tools/systemd/squid.service 2018-08-05 16:13:41.000000000 +0200 +++ new/squid-4.3/tools/systemd/squid.service 2018-09-30 20:57:54.000000000 +0200 @@ -8,7 +8,7 @@ [Unit] Description=Squid Web Proxy Server Documentation=man:squid(8) -After=network.target nss-lookup.target +After=network.target network-online.target nss-lookup.target [Service] Type=forking ++++++ squid-4.2.tar.xz.asc -> squid-4.3.tar.xz.asc ++++++ --- /work/SRC/openSUSE:Factory/squid/squid-4.2.tar.xz.asc 2018-08-15 10:36:36.792096819 +0200 +++ /work/SRC/openSUSE:Factory/.squid.new/squid-4.3.tar.xz.asc 2018-10-04 19:02:33.223136560 +0200 @@ -1,25 +1,25 @@ -File: squid-4.2.tar.xz -Date: Sun Aug 5 15:04:50 UTC 2018 -Size: 2426856 -MD5 : 2cf3f5f183d04322d798f98ea5ead43f -SHA1: 77fd6f06e6028780faf85ba7e7e9aef0922e9dc0 +File: squid-4.3.tar.xz +Date: Sun Sep 30 19:40:57 UTC 2018 +Size: 2435880 +MD5 : ebb67abaec4db9d298c0edd8e1ffaca4 +SHA1: 690540e7d0904e3959557f8beca45dbac1c94578 Key : CD6DBF8EF3B17D3E <[email protected]> B068 84ED B779 C89B 044E 64E3 CD6D BF8E F3B1 7D3E keyring = http://www.squid-cache.org/pgp.asc keyserver = pool.sks-keyservers.net -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAltnEhsACgkQzW2/jvOx -fT5elRAAvdmTD1kxfE4CZEmp2SJ1KgfMaCXehFFtFYRbdi8oNYoN5u75mwgo2VO1 -WmBedYJ3c9UKyaqu5AIc60WRIE+boFBy0vvaJO5T+wl3Ay1SKkuS5253dllxg6RT -r+1Kh9j72rchyBTerWClAydH5PRc9r5fNOzufJGTV8s/SCoAD+dxZHFZT6kad9U1 -n0+vcOM1I8dJCVNDakTXqY0zou/gURLfl7EJW/PYkHatJitXazoRVPROF0G1U4Xh -+/wDGj+1+bUEj7K4YIJ2/LfftnVY+c85UiG7URFZ32uNJx8aM7zevfSePdgN6U7c -DUBvtIScI/b2NOgp3scNKuDFs61aLIx8qOjXa603xQs2xbsufCaTv8vFnEz/oO0F -+924pcT3Fbh3vYe3iWP9MejaFf2dDF+1OAGt2sY/LX10VO68bEGpF0fAWGbyDEOC -HGk5cNdfUIK3TISbTOGzG7X3ysZ+5/UxtX4Q1y7x9vBVXGfdZrixfWG9BZkcYyxz -SvykpFe9WvNw1zoIUED/8Sf1FgK0f+WGrpyCnDSDnUrJ26NZOtTkXkJgf239yNBH -KUNgaTxH20Ix8mPGDohT5QgmvpULz0r5ZecHkeoYzyxvF8c6EFOdVt6Iq4jdOT3v -QpcZhfxQhg8yklE+cQjbD0Qywc0QIu19Uzh5URDu4UrarsVVpKM= -=I3Em +iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAluxJtUACgkQzW2/jvOx +fT50ZxAAnvDo6WNO/ZJTbNvgiH78/U8aO/PFseR/ZXSwhFU+OmGsouhIxFCtEi+X +c3Zk8yxl48nGQA72gR44n46V6uADQXXv7lxZb1aHjulbgMBCK4o03jpzAalgREAy +UkJnxWp+5VE43eML1iep27TpZlnWo7cUfXAJtv1NugdgUw8sOuWVIvI/9h5mtgcw +UVBXI8UWsA3p1RmllF8fBPXwcJKJdGPKxu598pC/ctjxJXZtaFnqj50j7QqL7+cE +Xh3w9ozdW2e624keY/iaXPJXTEHPyGPGDkfxLn2bVpbYfc+avgdtI8MsshFBVHzD +vOSO8bxWrFaA2VSihCKEMtvXEYXZhI0EQZOVJGEP7IOxz6sLTYg1c24yG5PDMUTD +l9bSZmpvcqmeiUrMbczwOYCP8lG+Sqj+cc8AroTxG1+wRKgTtZmgYBakEoYcZm6G +VFS08hV5YzTB6yAh7nUAd1kQDT6rKKKcDbWOBmc9xEut1eGZVDd4hkUQif+kKIWi +WVPuUKhyk454xI2J9F5L1isnR1XLzPiOFsnjlDH63/KhcJoRyPElWCBl229xLvAE +1FGxIa0GYXY8J2tXoaPXRhd6AW/ThsIQnQqgjbwSp/uqtXL8E6LioKMtxAdgXDzH +1yK8nNPCSjaqcfrAADgl6kfbvSALPhg5lGDN0aRaCz0cf53TZ30= +=HvFs -----END PGP SIGNATURE-----
