From: squidadm Date: Thu, 3 Feb 2022 12:44:53 +0000 (+0000) Subject: Source Format Enforcement (#963) X-Git-Tag: SQUID_6_0_1~244 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf95c10aa95bf8e56d9d8d1545cb5a3aafab0d2c;p=thirdparty%2Fsquid.git Source Format Enforcement (#963) Besides routine formatting enforcement, this change contains flag-day updates and code polishing from code removals performed in the latter half of 2021 (e.g., HERE removal). (summary) log from the script execution: UPDATE COPYRIGHT for ... NOTICE: File ... changed: by scripts/maintenance/HERE-obsolete NOTICE: File src/Makefile.am changed: by scripts/format-makefile-am.pl NOTICE: File src/sbuf/Stream.h changed: by scripts/maintenance/sort-includes.pl NOTICE: File src/tests/stub_store_client.cc changed: by scripts/maintenance/sort-includes.pl If you are worried about hitting all this at once when rebasing a large patch you can split the rebase into steps as follows: git fetch --all git rebase [ commit ID prior to this one ] git rebase [ this commit's ID ] git rebase master --- diff --git a/INSTALL b/INSTALL index e6364d69b8..ce3e3a63b1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/Makefile.am b/Makefile.am index 6486941528..78e72d6d83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/QUICKSTART b/QUICKSTART index 992c2948ad..f2070b5501 100644 --- a/QUICKSTART +++ b/QUICKSTART @@ -99,7 +99,7 @@ typically have to modify something in a /etc/rc_something). ============================================================================== /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/README b/README index dadcd72a05..227b40827d 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ SQUID Web Proxy Cache http://www.squid-cache.org/ ------------------------------------------------------------------------ -Copyright (C) 1996-2021 The Squid Software Foundation and contributors +Copyright (C) 1996-2022 The Squid Software Foundation and contributors Squid software is distributed under GPLv2+ license and includes contributions from numerous individuals and organizations. diff --git a/acinclude/ax_cxx_0x_types.m4 b/acinclude/ax_cxx_0x_types.m4 index 289b49f53f..4afc87aaf3 100644 --- a/acinclude/ax_cxx_0x_types.m4 +++ b/acinclude/ax_cxx_0x_types.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/ax_cxx_compile_stdcxx_11.m4 b/acinclude/ax_cxx_compile_stdcxx_11.m4 index cd5ced7dad..bc65be9023 100644 --- a/acinclude/ax_cxx_compile_stdcxx_11.m4 +++ b/acinclude/ax_cxx_compile_stdcxx_11.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/ax_with_prog.m4 b/acinclude/ax_with_prog.m4 index 292b2b6142..004845b228 100644 --- a/acinclude/ax_with_prog.m4 +++ b/acinclude/ax_with_prog.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/compiler-flags.m4 b/acinclude/compiler-flags.m4 index 3b2331e58f..fa211bda05 100644 --- a/acinclude/compiler-flags.m4 +++ b/acinclude/compiler-flags.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/init.m4 b/acinclude/init.m4 index 97b26f42fc..5433d7a511 100644 --- a/acinclude/init.m4 +++ b/acinclude/init.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/krb5.m4 b/acinclude/krb5.m4 index 6db2c6d69b..7aa93abd85 100644 --- a/acinclude/krb5.m4 +++ b/acinclude/krb5.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/lib-checks.m4 b/acinclude/lib-checks.m4 index b614810fd7..a1015ad063 100644 --- a/acinclude/lib-checks.m4 +++ b/acinclude/lib-checks.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4 index 3b2e702c6c..1887fc2ee7 100644 --- a/acinclude/os-deps.m4 +++ b/acinclude/os-deps.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/pam.m4 b/acinclude/pam.m4 index 6538697428..817cd0e69b 100644 --- a/acinclude/pam.m4 +++ b/acinclude/pam.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/pkg.m4 b/acinclude/pkg.m4 index 8f1dd783b4..8e8c15f452 100644 --- a/acinclude/pkg.m4 +++ b/acinclude/pkg.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4 index 8212ed601b..6771a9107d 100644 --- a/acinclude/squid-util.m4 +++ b/acinclude/squid-util.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/acinclude/tdb.m4 b/acinclude/tdb.m4 index 5baef61c4a..545353363c 100644 --- a/acinclude/tdb.m4 +++ b/acinclude/tdb.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/bootstrap.sh b/bootstrap.sh index 103886b720..abe2e51ca6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/compat/GnuRegex.c b/compat/GnuRegex.c index 344da3ad63..842d3cc5f4 100644 --- a/compat/GnuRegex.c +++ b/compat/GnuRegex.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/GnuRegex.h b/compat/GnuRegex.h index 474f79785e..14482b94b6 100644 --- a/compat/GnuRegex.h +++ b/compat/GnuRegex.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/Makefile.am b/compat/Makefile.am index eb0c53960b..66d5ed373f 100644 --- a/compat/Makefile.am +++ b/compat/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/compat/assert.cc b/compat/assert.cc index 8db8b06daa..82fcb61022 100644 --- a/compat/assert.cc +++ b/compat/assert.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/assert.h b/compat/assert.h index 0c436be857..2f04a4da93 100644 --- a/compat/assert.h +++ b/compat/assert.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/cmsg.h b/compat/cmsg.h index 9d0bdb12cc..ee6c167edb 100644 --- a/compat/cmsg.h +++ b/compat/cmsg.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/compat.cc b/compat/compat.cc index e145950d6a..d3d5e845fc 100644 --- a/compat/compat.cc +++ b/compat/compat.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/compat.dox b/compat/compat.dox index 5563defd0f..540db47c89 100644 --- a/compat/compat.dox +++ b/compat/compat.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/compat.h b/compat/compat.h index 59cbe7a3b8..3c1f12c6f0 100644 --- a/compat/compat.h +++ b/compat/compat.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/compat_shared.h b/compat/compat_shared.h index d59c76d430..db06cfd728 100644 --- a/compat/compat_shared.h +++ b/compat/compat_shared.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/cppunit.h b/compat/cppunit.h index 7def522c47..aee99328e7 100644 --- a/compat/cppunit.h +++ b/compat/cppunit.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/cpu.h b/compat/cpu.h index 730d8079f0..32dfd98dc6 100644 --- a/compat/cpu.h +++ b/compat/cpu.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/debug.cc b/compat/debug.cc index a313372541..564b5e7ef9 100644 --- a/compat/debug.cc +++ b/compat/debug.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/debug.h b/compat/debug.h index 139b41fdf8..66beb0f5cb 100644 --- a/compat/debug.h +++ b/compat/debug.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/eui64_aton.c b/compat/eui64_aton.c index b9243436db..5487185f13 100644 --- a/compat/eui64_aton.c +++ b/compat/eui64_aton.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/eui64_aton.h b/compat/eui64_aton.h index ad79445837..b6222829f8 100644 --- a/compat/eui64_aton.h +++ b/compat/eui64_aton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/fdsetsize.h b/compat/fdsetsize.h index b7b315a4a7..03a79e2324 100644 --- a/compat/fdsetsize.h +++ b/compat/fdsetsize.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/getaddrinfo.cc b/compat/getaddrinfo.cc index 8a38cf53a5..eaa8998ae4 100644 --- a/compat/getaddrinfo.cc +++ b/compat/getaddrinfo.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/getaddrinfo.h b/compat/getaddrinfo.h index 9744844944..d27042f491 100644 --- a/compat/getaddrinfo.h +++ b/compat/getaddrinfo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/getnameinfo.cc b/compat/getnameinfo.cc index 7a458de898..a3c8f5ff57 100644 --- a/compat/getnameinfo.cc +++ b/compat/getnameinfo.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/getnameinfo.h b/compat/getnameinfo.h index ba54b197be..6fa077b25f 100644 --- a/compat/getnameinfo.h +++ b/compat/getnameinfo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/inet_ntop.cc b/compat/inet_ntop.cc index 62b260665a..5ff864c86b 100644 --- a/compat/inet_ntop.cc +++ b/compat/inet_ntop.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/inet_ntop.h b/compat/inet_ntop.h index 9d00b2de22..2ff5cb04c9 100644 --- a/compat/inet_ntop.h +++ b/compat/inet_ntop.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/inet_pton.cc b/compat/inet_pton.cc index cbcd1e1174..2ec56d7173 100644 --- a/compat/inet_pton.cc +++ b/compat/inet_pton.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/inet_pton.h b/compat/inet_pton.h index 82486f37fb..f81f9a2038 100644 --- a/compat/inet_pton.h +++ b/compat/inet_pton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/initgroups.c b/compat/initgroups.c index 60a010d806..5c8e29f24a 100644 --- a/compat/initgroups.c +++ b/compat/initgroups.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/initgroups.h b/compat/initgroups.h index 2da98951ab..61c4a5f176 100644 --- a/compat/initgroups.h +++ b/compat/initgroups.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/memrchr.cc b/compat/memrchr.cc index 8b5d320057..f2e297f0c1 100644 --- a/compat/memrchr.cc +++ b/compat/memrchr.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/memrchr.h b/compat/memrchr.h index 7c99ec6933..3ac22dab26 100644 --- a/compat/memrchr.h +++ b/compat/memrchr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/mswindows.cc b/compat/mswindows.cc index cf5b53b375..fa0ec3fcd6 100644 --- a/compat/mswindows.cc +++ b/compat/mswindows.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/openssl.h b/compat/openssl.h index 615919f539..cd3145714f 100644 --- a/compat/openssl.h +++ b/compat/openssl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/aix.h b/compat/os/aix.h index d1be71d9a6..b6afd67a99 100644 --- a/compat/os/aix.h +++ b/compat/os/aix.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/android.h b/compat/os/android.h index e750f47d7b..8730193610 100644 --- a/compat/os/android.h +++ b/compat/os/android.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/dragonfly.h b/compat/os/dragonfly.h index dff2a2b14a..f0abf81c09 100644 --- a/compat/os/dragonfly.h +++ b/compat/os/dragonfly.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/freebsd.h b/compat/os/freebsd.h index a62f8b39b0..30d8bf1015 100644 --- a/compat/os/freebsd.h +++ b/compat/os/freebsd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/hpux.h b/compat/os/hpux.h index af384a2372..c28570ed04 100644 --- a/compat/os/hpux.h +++ b/compat/os/hpux.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/linux.h b/compat/os/linux.h index 3058e34c73..6a36fe604d 100644 --- a/compat/os/linux.h +++ b/compat/os/linux.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/macosx.h b/compat/os/macosx.h index 9908df0b74..b35d83c3aa 100644 --- a/compat/os/macosx.h +++ b/compat/os/macosx.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/mswindows.h b/compat/os/mswindows.h index 56a4126790..a819767d5f 100644 --- a/compat/os/mswindows.h +++ b/compat/os/mswindows.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/netbsd.h b/compat/os/netbsd.h index d356ae9b5e..54e61850b4 100644 --- a/compat/os/netbsd.h +++ b/compat/os/netbsd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/openbsd.h b/compat/os/openbsd.h index aaabf97b1e..7d0f06d59d 100644 --- a/compat/os/openbsd.h +++ b/compat/os/openbsd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/opensolaris_10_netdb.h b/compat/os/opensolaris_10_netdb.h index f01c8c90ae..dc491e2eaf 100644 --- a/compat/os/opensolaris_10_netdb.h +++ b/compat/os/opensolaris_10_netdb.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/os2.h b/compat/os/os2.h index 65630a0c09..c7a4e471a1 100644 --- a/compat/os/os2.h +++ b/compat/os/os2.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/qnx.h b/compat/os/qnx.h index 358b3777b7..f10ae651cc 100644 --- a/compat/os/qnx.h +++ b/compat/os/qnx.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/sgi.h b/compat/os/sgi.h index 7b1d0a375e..3fb7d26692 100644 --- a/compat/os/sgi.h +++ b/compat/os/sgi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/solaris.h b/compat/os/solaris.h index 951606edbc..7fdd6ba991 100644 --- a/compat/os/solaris.h +++ b/compat/os/solaris.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/os/sunos.h b/compat/os/sunos.h index c558da2b0e..c3a3689675 100644 --- a/compat/os/sunos.h +++ b/compat/os/sunos.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/osdetect.h b/compat/osdetect.h index 17f8aa9675..92868c9d2d 100644 --- a/compat/osdetect.h +++ b/compat/osdetect.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/psignal.c b/compat/psignal.c index f9c23fea12..4789c28deb 100644 --- a/compat/psignal.c +++ b/compat/psignal.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/psignal.h b/compat/psignal.h index 6100ee5490..84ad4629ee 100644 --- a/compat/psignal.h +++ b/compat/psignal.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/shm.cc b/compat/shm.cc index 3a8b1ba78f..186939967d 100644 --- a/compat/shm.cc +++ b/compat/shm.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/shm.h b/compat/shm.h index 6c3f33308a..10b89ded7d 100644 --- a/compat/shm.h +++ b/compat/shm.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/statvfs.cc b/compat/statvfs.cc index 634e82f1ce..5cad769174 100644 --- a/compat/statvfs.cc +++ b/compat/statvfs.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/statvfs.h b/compat/statvfs.h index 79d63ca35c..3129f62da5 100644 --- a/compat/statvfs.h +++ b/compat/statvfs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/stdio.h b/compat/stdio.h index 5d471526aa..5c381c90a8 100644 --- a/compat/stdio.h +++ b/compat/stdio.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/stdvarargs.h b/compat/stdvarargs.h index e4fa79037c..2ab02ffbaf 100644 --- a/compat/stdvarargs.h +++ b/compat/stdvarargs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/strerror.c b/compat/strerror.c index f4b7e854d3..1086ae6f6c 100644 --- a/compat/strerror.c +++ b/compat/strerror.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/strnrchr.c b/compat/strnrchr.c index c14e85ce35..c30c3d668b 100644 --- a/compat/strnrchr.c +++ b/compat/strnrchr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/strnrchr.h b/compat/strnrchr.h index 7cd8879af2..666a51785c 100644 --- a/compat/strnrchr.h +++ b/compat/strnrchr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/strnstr.cc b/compat/strnstr.cc index b8397b700f..fee92c0448 100644 --- a/compat/strnstr.cc +++ b/compat/strnstr.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/strtoll.c b/compat/strtoll.c index fe3467adb0..15697ec0eb 100644 --- a/compat/strtoll.c +++ b/compat/strtoll.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/strtoll.h b/compat/strtoll.h index 88f2dc54b6..fa4a62d39d 100644 --- a/compat/strtoll.h +++ b/compat/strtoll.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/tempnam.c b/compat/tempnam.c index 38d3443581..99c6b4c59e 100644 --- a/compat/tempnam.c +++ b/compat/tempnam.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/tempnam.h b/compat/tempnam.h index 5e686fac49..a56ee8d759 100644 --- a/compat/tempnam.h +++ b/compat/tempnam.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/testPreCompiler.cc b/compat/testPreCompiler.cc index a99232cfd4..04f7501e7d 100644 --- a/compat/testPreCompiler.cc +++ b/compat/testPreCompiler.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/testPreCompiler.h b/compat/testPreCompiler.h index 3b972608e3..05960b9a49 100644 --- a/compat/testPreCompiler.h +++ b/compat/testPreCompiler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/types.h b/compat/types.h index 4c8a654f88..360069d54b 100644 --- a/compat/types.h +++ b/compat/types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/valgrind.h b/compat/valgrind.h index 0d0e6be742..a28c25eb2f 100644 --- a/compat/valgrind.h +++ b/compat/valgrind.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/xalloc.cc b/compat/xalloc.cc index e94caaf4c3..b2f087cd61 100644 --- a/compat/xalloc.cc +++ b/compat/xalloc.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/xalloc.h b/compat/xalloc.h index 0601d7c685..acd3f5293a 100644 --- a/compat/xalloc.h +++ b/compat/xalloc.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/xis.h b/compat/xis.h index 8a6c945748..0ab664b148 100644 --- a/compat/xis.h +++ b/compat/xis.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/xstrerror.cc b/compat/xstrerror.cc index f32448f9ae..0b2f315cd4 100644 --- a/compat/xstrerror.cc +++ b/compat/xstrerror.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/xstrerror.h b/compat/xstrerror.h index 79fa54400d..8eedefa7cf 100644 --- a/compat/xstrerror.h +++ b/compat/xstrerror.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/xstring.cc b/compat/xstring.cc index df4cf9bd33..75295573da 100644 --- a/compat/xstring.cc +++ b/compat/xstring.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/xstring.h b/compat/xstring.h index 09466c24b7..decdd829e9 100644 --- a/compat/xstring.h +++ b/compat/xstring.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/xstrto.cc b/compat/xstrto.cc index 52cde34b52..d6b8a6e4e2 100644 --- a/compat/xstrto.cc +++ b/compat/xstrto.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/compat/xstrto.h b/compat/xstrto.h index 1e44619ea6..ca8c0d3f28 100644 --- a/compat/xstrto.h +++ b/compat/xstrto.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/configure.ac b/configure.ac index 7b269383c1..f45b60018a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/contrib/Makefile.am b/contrib/Makefile.am index d8848d46ca..1d39432cb0 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/contrib/solaris/solaris-krb5-include.patch b/contrib/solaris/solaris-krb5-include.patch index 0ccc04ded6..f9aa240461 100644 --- a/contrib/solaris/solaris-krb5-include.patch +++ b/contrib/solaris/solaris-krb5-include.patch @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/contrib/url-normalizer.pl b/contrib/url-normalizer.pl index b0f5c0cde0..2a10205ed5 100755 --- a/contrib/url-normalizer.pl +++ b/contrib/url-normalizer.pl @@ -1,6 +1,6 @@ #!/usr/local/bin/perl -Tw # -# * Copyright (C) 1996-2021 The Squid Software Foundation and contributors +# * Copyright (C) 1996-2022 The Squid Software Foundation and contributors # * # * Squid software is distributed under GPLv2+ license and includes # * contributions from numerous individuals and organizations. diff --git a/contrib/user-agents.pl b/contrib/user-agents.pl index 1202a4fdfe..d5d4f4a261 100755 --- a/contrib/user-agents.pl +++ b/contrib/user-agents.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# * Copyright (C) 1996-2021 The Squid Software Foundation and contributors +# * Copyright (C) 1996-2022 The Squid Software Foundation and contributors # * # * Squid software is distributed under GPLv2+ license and includes # * contributions from numerous individuals and organizations. diff --git a/doc/Makefile.am b/doc/Makefile.am index 39970a958f..0a88f1adbf 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/01_Main.dox b/doc/Programming-Guide/01_Main.dox index 4a14502a79..b605eabb22 100644 --- a/doc/Programming-Guide/01_Main.dox +++ b/doc/Programming-Guide/01_Main.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/02_CodingConventions.dox b/doc/Programming-Guide/02_CodingConventions.dox index b28b4c3128..f5c567684f 100644 --- a/doc/Programming-Guide/02_CodingConventions.dox +++ b/doc/Programming-Guide/02_CodingConventions.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/03_MajorComponents.dox b/doc/Programming-Guide/03_MajorComponents.dox index 7f94269dc8..0f987c6560 100644 --- a/doc/Programming-Guide/03_MajorComponents.dox +++ b/doc/Programming-Guide/03_MajorComponents.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/05_TypicalRequestFlow.dox b/doc/Programming-Guide/05_TypicalRequestFlow.dox index d178c85db2..3525baeb61 100644 --- a/doc/Programming-Guide/05_TypicalRequestFlow.dox +++ b/doc/Programming-Guide/05_TypicalRequestFlow.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/AccessControls.dox b/doc/Programming-Guide/AccessControls.dox index 4ff600ca82..20f387b0e3 100644 --- a/doc/Programming-Guide/AccessControls.dox +++ b/doc/Programming-Guide/AccessControls.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/DelayPools.dox b/doc/Programming-Guide/DelayPools.dox index 5b0439e9e4..e2eede9656 100644 --- a/doc/Programming-Guide/DelayPools.dox +++ b/doc/Programming-Guide/DelayPools.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/Groups.dox b/doc/Programming-Guide/Groups.dox index a9cee3d084..9a0e0068cf 100644 --- a/doc/Programming-Guide/Groups.dox +++ b/doc/Programming-Guide/Groups.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/Makefile b/doc/Programming-Guide/Makefile index 2e23637d0f..3cc8d59047 100644 --- a/doc/Programming-Guide/Makefile +++ b/doc/Programming-Guide/Makefile @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/StorageManager.dox b/doc/Programming-Guide/StorageManager.dox index 52e0141d5c..c11a50a512 100644 --- a/doc/Programming-Guide/StorageManager.dox +++ b/doc/Programming-Guide/StorageManager.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/doc/Programming-Guide/doxygen.footer.dyn b/doc/Programming-Guide/doxygen.footer.dyn index d06b303c7b..9e780108c2 100644 --- a/doc/Programming-Guide/doxygen.footer.dyn +++ b/doc/Programming-Guide/doxygen.footer.dyn @@ -1,6 +1,6 @@ 1.2.3.0 */ /* Same as IPv6 (not so trivial to depict) */ diff --git a/src/acl/Ip.h b/src/acl/Ip.h index f07b3bb865..cd346d9033 100644 --- a/src/acl/Ip.h +++ b/src/acl/Ip.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/LocalIp.cc b/src/acl/LocalIp.cc index 79c41b0c1f..54b6ee17e8 100644 --- a/src/acl/LocalIp.cc +++ b/src/acl/LocalIp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/LocalIp.h b/src/acl/LocalIp.h index 57188fd139..f445524fb8 100644 --- a/src/acl/LocalIp.h +++ b/src/acl/LocalIp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/LocalPort.cc b/src/acl/LocalPort.cc index ca4e813925..41c7dfb5c2 100644 --- a/src/acl/LocalPort.cc +++ b/src/acl/LocalPort.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/LocalPort.h b/src/acl/LocalPort.h index 54500d7788..5f64278e7f 100644 --- a/src/acl/LocalPort.h +++ b/src/acl/LocalPort.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Makefile.am b/src/acl/Makefile.am index eb35c048af..d585aba960 100644 --- a/src/acl/Makefile.am +++ b/src/acl/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/MaxConnection.cc b/src/acl/MaxConnection.cc index 2e0f47a5bc..f57e4eb5a1 100644 --- a/src/acl/MaxConnection.cc +++ b/src/acl/MaxConnection.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/MaxConnection.h b/src/acl/MaxConnection.h index 14ce5089f6..d6441f7da4 100644 --- a/src/acl/MaxConnection.h +++ b/src/acl/MaxConnection.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Method.cc b/src/acl/Method.cc index f4021b81b8..37b1286732 100644 --- a/src/acl/Method.cc +++ b/src/acl/Method.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Method.h b/src/acl/Method.h index fe04ee38fe..42c0b138f3 100644 --- a/src/acl/Method.h +++ b/src/acl/Method.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc index 69154e3f8d..e60fc3076d 100644 --- a/src/acl/MethodData.cc +++ b/src/acl/MethodData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/MethodData.h b/src/acl/MethodData.h index b6ea55d6e4..eea68d9c82 100644 --- a/src/acl/MethodData.h +++ b/src/acl/MethodData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/MyPortName.cc b/src/acl/MyPortName.cc index 2fdfe31f87..a2ab2af63a 100644 --- a/src/acl/MyPortName.cc +++ b/src/acl/MyPortName.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/MyPortName.h b/src/acl/MyPortName.h index da0d9ed72f..dd40e5fc64 100644 --- a/src/acl/MyPortName.h +++ b/src/acl/MyPortName.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Note.cc b/src/acl/Note.cc index c0e210d5d5..3cedfbf5ba 100644 --- a/src/acl/Note.cc +++ b/src/acl/Note.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Note.h b/src/acl/Note.h index 6177e26f54..7aea5e00d4 100644 --- a/src/acl/Note.h +++ b/src/acl/Note.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/NoteData.cc b/src/acl/NoteData.cc index a8417a1288..df8dfc0819 100644 --- a/src/acl/NoteData.cc +++ b/src/acl/NoteData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/NoteData.h b/src/acl/NoteData.h index ceb87dd5c2..51cc9732c4 100644 --- a/src/acl/NoteData.h +++ b/src/acl/NoteData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Options.cc b/src/acl/Options.cc index 4a7667d5fc..b061571626 100644 --- a/src/acl/Options.cc +++ b/src/acl/Options.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Options.h b/src/acl/Options.h index e45e0af471..5b2199cb02 100644 --- a/src/acl/Options.h +++ b/src/acl/Options.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/PeerName.cc b/src/acl/PeerName.cc index 2a651137e4..d1ec1af2e7 100644 --- a/src/acl/PeerName.cc +++ b/src/acl/PeerName.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/PeerName.h b/src/acl/PeerName.h index 77ec5298af..3cb3a1ab02 100644 --- a/src/acl/PeerName.h +++ b/src/acl/PeerName.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Protocol.cc b/src/acl/Protocol.cc index c6cd757ae2..b20809edda 100644 --- a/src/acl/Protocol.cc +++ b/src/acl/Protocol.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Protocol.h b/src/acl/Protocol.h index 24adc57944..13e41ed017 100644 --- a/src/acl/Protocol.h +++ b/src/acl/Protocol.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc index d69ecd2c16..c1b8fec64c 100644 --- a/src/acl/ProtocolData.cc +++ b/src/acl/ProtocolData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/ProtocolData.h b/src/acl/ProtocolData.h index 6fbe09e9f9..a1c01b93be 100644 --- a/src/acl/ProtocolData.h +++ b/src/acl/ProtocolData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Random.cc b/src/acl/Random.cc index f3813df238..5a406e42ef 100644 --- a/src/acl/Random.cc +++ b/src/acl/Random.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Random.h b/src/acl/Random.h index 1573f8192c..d1e12f205e 100644 --- a/src/acl/Random.h +++ b/src/acl/Random.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc index ecd9c33ecd..c70564682b 100644 --- a/src/acl/RegexData.cc +++ b/src/acl/RegexData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/RegexData.h b/src/acl/RegexData.h index 0512c0ed49..66b05eecd0 100644 --- a/src/acl/RegexData.h +++ b/src/acl/RegexData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/ReplyHeaderStrategy.h b/src/acl/ReplyHeaderStrategy.h index a430335201..eac8046773 100644 --- a/src/acl/ReplyHeaderStrategy.h +++ b/src/acl/ReplyHeaderStrategy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/ReplyMimeType.h b/src/acl/ReplyMimeType.h index cc4b7bbef2..0ee9fc36f9 100644 --- a/src/acl/ReplyMimeType.h +++ b/src/acl/ReplyMimeType.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/RequestHeaderStrategy.h b/src/acl/RequestHeaderStrategy.h index 2bf7efc145..18bb421796 100644 --- a/src/acl/RequestHeaderStrategy.h +++ b/src/acl/RequestHeaderStrategy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/RequestMimeType.h b/src/acl/RequestMimeType.h index fd8c9f4564..682cb7eb15 100644 --- a/src/acl/RequestMimeType.h +++ b/src/acl/RequestMimeType.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/ServerCertificate.cc b/src/acl/ServerCertificate.cc index 21c8591b7b..6db2105a8d 100644 --- a/src/acl/ServerCertificate.cc +++ b/src/acl/ServerCertificate.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/ServerCertificate.h b/src/acl/ServerCertificate.h index 3ac35e7f01..ba300cc17e 100644 --- a/src/acl/ServerCertificate.h +++ b/src/acl/ServerCertificate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/ServerName.cc b/src/acl/ServerName.cc index ad43affca0..2aa627320d 100644 --- a/src/acl/ServerName.cc +++ b/src/acl/ServerName.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/ServerName.h b/src/acl/ServerName.h index 0bb4be7a68..e3f54cd6c1 100644 --- a/src/acl/ServerName.h +++ b/src/acl/ServerName.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SourceAsn.h b/src/acl/SourceAsn.h index 90cbfec039..38be7e1ce4 100644 --- a/src/acl/SourceAsn.h +++ b/src/acl/SourceAsn.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SourceDomain.cc b/src/acl/SourceDomain.cc index 91b03d271e..af9b1bdd58 100644 --- a/src/acl/SourceDomain.cc +++ b/src/acl/SourceDomain.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SourceDomain.h b/src/acl/SourceDomain.h index 8e7b9c8d2a..d93aefa9e8 100644 --- a/src/acl/SourceDomain.h +++ b/src/acl/SourceDomain.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SourceIp.cc b/src/acl/SourceIp.cc index 10bb95300d..16ccb90500 100644 --- a/src/acl/SourceIp.cc +++ b/src/acl/SourceIp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SourceIp.h b/src/acl/SourceIp.h index daf3a3e92b..d37b39763f 100644 --- a/src/acl/SourceIp.h +++ b/src/acl/SourceIp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SquidError.cc b/src/acl/SquidError.cc index 6e3e8c2bab..6547623eff 100644 --- a/src/acl/SquidError.cc +++ b/src/acl/SquidError.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SquidError.h b/src/acl/SquidError.h index 402be8823a..47bce6395f 100644 --- a/src/acl/SquidError.h +++ b/src/acl/SquidError.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SquidErrorData.cc b/src/acl/SquidErrorData.cc index 5c7148c02a..f74bdf6bb6 100644 --- a/src/acl/SquidErrorData.cc +++ b/src/acl/SquidErrorData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SquidErrorData.h b/src/acl/SquidErrorData.h index 3a7787f0ac..13acad7b61 100644 --- a/src/acl/SquidErrorData.h +++ b/src/acl/SquidErrorData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SslError.cc b/src/acl/SslError.cc index c107d735f7..482a63fa9d 100644 --- a/src/acl/SslError.cc +++ b/src/acl/SslError.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SslError.h b/src/acl/SslError.h index dc1687c61b..6ca38ef79f 100644 --- a/src/acl/SslError.h +++ b/src/acl/SslError.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc index 004415e9f1..e1e1375ed1 100644 --- a/src/acl/SslErrorData.cc +++ b/src/acl/SslErrorData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/SslErrorData.h b/src/acl/SslErrorData.h index f4fd6a2032..75c9981d22 100644 --- a/src/acl/SslErrorData.h +++ b/src/acl/SslErrorData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Strategised.cc b/src/acl/Strategised.cc index 8fdb490dba..303beccc9c 100644 --- a/src/acl/Strategised.cc +++ b/src/acl/Strategised.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Strategised.h b/src/acl/Strategised.h index f3814667bb..1c745d2b1f 100644 --- a/src/acl/Strategised.h +++ b/src/acl/Strategised.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Strategy.h b/src/acl/Strategy.h index 1a8aef989f..27b2a6695f 100644 --- a/src/acl/Strategy.h +++ b/src/acl/Strategy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc index e1fcfe7c2e..ae50a8aec3 100644 --- a/src/acl/StringData.cc +++ b/src/acl/StringData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/StringData.h b/src/acl/StringData.h index 96affd4033..c0e4be364f 100644 --- a/src/acl/StringData.h +++ b/src/acl/StringData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Tag.cc b/src/acl/Tag.cc index 7e94c8bc76..a2a2241886 100644 --- a/src/acl/Tag.cc +++ b/src/acl/Tag.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Tag.h b/src/acl/Tag.h index 4f07b9a760..d6f0624109 100644 --- a/src/acl/Tag.h +++ b/src/acl/Tag.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Time.cc b/src/acl/Time.cc index f2a512e9f2..828aeb76a4 100644 --- a/src/acl/Time.cc +++ b/src/acl/Time.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Time.h b/src/acl/Time.h index 13426f4cae..cf18050bbc 100644 --- a/src/acl/Time.h +++ b/src/acl/Time.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/TimeData.cc b/src/acl/TimeData.cc index 13d9079f4e..a1637c7d44 100644 --- a/src/acl/TimeData.cc +++ b/src/acl/TimeData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/TimeData.h b/src/acl/TimeData.h index 15c755c943..260850958c 100644 --- a/src/acl/TimeData.h +++ b/src/acl/TimeData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/TransactionInitiator.cc b/src/acl/TransactionInitiator.cc index b4e8ae991c..f6cf160315 100644 --- a/src/acl/TransactionInitiator.cc +++ b/src/acl/TransactionInitiator.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/TransactionInitiator.h b/src/acl/TransactionInitiator.h index c7897b7330..c87feb3c8f 100644 --- a/src/acl/TransactionInitiator.h +++ b/src/acl/TransactionInitiator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Tree.cc b/src/acl/Tree.cc index de786f3c24..aada3f932f 100644 --- a/src/acl/Tree.cc +++ b/src/acl/Tree.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Tree.h b/src/acl/Tree.h index 394ca8cf19..8051080f90 100644 --- a/src/acl/Tree.h +++ b/src/acl/Tree.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Url.cc b/src/acl/Url.cc index f6cbb798e1..f897a59bb6 100644 --- a/src/acl/Url.cc +++ b/src/acl/Url.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/Url.h b/src/acl/Url.h index eafdea6529..8cd63fd2e9 100644 --- a/src/acl/Url.h +++ b/src/acl/Url.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/UrlLogin.cc b/src/acl/UrlLogin.cc index 057f3a8c55..66745ccfa2 100644 --- a/src/acl/UrlLogin.cc +++ b/src/acl/UrlLogin.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/UrlLogin.h b/src/acl/UrlLogin.h index 620d771e82..10538f70b9 100644 --- a/src/acl/UrlLogin.h +++ b/src/acl/UrlLogin.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/UrlPath.cc b/src/acl/UrlPath.cc index 602dbc361c..ff3e6db90d 100644 --- a/src/acl/UrlPath.cc +++ b/src/acl/UrlPath.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/UrlPath.h b/src/acl/UrlPath.h index 993ac63058..419d44fc17 100644 --- a/src/acl/UrlPath.h +++ b/src/acl/UrlPath.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/UrlPort.cc b/src/acl/UrlPort.cc index 6902979957..6214694bc1 100644 --- a/src/acl/UrlPort.cc +++ b/src/acl/UrlPort.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/UrlPort.h b/src/acl/UrlPort.h index 3b989d0ac7..e14b9320b1 100644 --- a/src/acl/UrlPort.h +++ b/src/acl/UrlPort.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc index d96d312121..c81474dda6 100644 --- a/src/acl/UserData.cc +++ b/src/acl/UserData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/UserData.h b/src/acl/UserData.h index 0a8f4862c5..939699fc90 100644 --- a/src/acl/UserData.h +++ b/src/acl/UserData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/AD_group/Makefile.am b/src/acl/external/AD_group/Makefile.am index 31d205f3c1..c07c332415 100644 --- a/src/acl/external/AD_group/Makefile.am +++ b/src/acl/external/AD_group/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/AD_group/ext_ad_group_acl.8 b/src/acl/external/AD_group/ext_ad_group_acl.8 index f83c6125c7..e52ccafa98 100644 --- a/src/acl/external/AD_group/ext_ad_group_acl.8 +++ b/src/acl/external/AD_group/ext_ad_group_acl.8 @@ -237,7 +237,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/AD_group/ext_ad_group_acl.cc b/src/acl/external/AD_group/ext_ad_group_acl.cc index 4a60817cc6..534d6292be 100644 --- a/src/acl/external/AD_group/ext_ad_group_acl.cc +++ b/src/acl/external/AD_group/ext_ad_group_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/AD_group/required.m4 b/src/acl/external/AD_group/required.m4 index a749436edc..ae07e21a28 100755 --- a/src/acl/external/AD_group/required.m4 +++ b/src/acl/external/AD_group/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/LDAP_group/ChangeLog b/src/acl/external/LDAP_group/ChangeLog index fd498895d9..9c9667fb65 100644 --- a/src/acl/external/LDAP_group/ChangeLog +++ b/src/acl/external/LDAP_group/ChangeLog @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/LDAP_group/Makefile.am b/src/acl/external/LDAP_group/Makefile.am index ec2890a2df..9d482f855c 100644 --- a/src/acl/external/LDAP_group/Makefile.am +++ b/src/acl/external/LDAP_group/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/LDAP_group/ext_ldap_group_acl.8 b/src/acl/external/LDAP_group/ext_ldap_group_acl.8 index 08127e3a87..6bbcbada90 100644 --- a/src/acl/external/LDAP_group/ext_ldap_group_acl.8 +++ b/src/acl/external/LDAP_group/ext_ldap_group_acl.8 @@ -242,7 +242,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/LDAP_group/ext_ldap_group_acl.cc b/src/acl/external/LDAP_group/ext_ldap_group_acl.cc index 857cb471f0..e471eda3f6 100644 --- a/src/acl/external/LDAP_group/ext_ldap_group_acl.cc +++ b/src/acl/external/LDAP_group/ext_ldap_group_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/LDAP_group/required.m4 b/src/acl/external/LDAP_group/required.m4 index 2f4b673649..b575b60698 100755 --- a/src/acl/external/LDAP_group/required.m4 +++ b/src/acl/external/LDAP_group/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/LM_group/Makefile.am b/src/acl/external/LM_group/Makefile.am index d4b0e490fc..8b99773d05 100644 --- a/src/acl/external/LM_group/Makefile.am +++ b/src/acl/external/LM_group/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/LM_group/ext_lm_group_acl.8 b/src/acl/external/LM_group/ext_lm_group_acl.8 index 93801ebde2..50c7299207 100644 --- a/src/acl/external/LM_group/ext_lm_group_acl.8 +++ b/src/acl/external/LM_group/ext_lm_group_acl.8 @@ -169,7 +169,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/LM_group/ext_lm_group_acl.cc b/src/acl/external/LM_group/ext_lm_group_acl.cc index c6ca3fcaee..50ef7aeb2c 100644 --- a/src/acl/external/LM_group/ext_lm_group_acl.cc +++ b/src/acl/external/LM_group/ext_lm_group_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/LM_group/required.m4 b/src/acl/external/LM_group/required.m4 index 5fe8a2cfb1..5708628375 100755 --- a/src/acl/external/LM_group/required.m4 +++ b/src/acl/external/LM_group/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/Makefile.am b/src/acl/external/Makefile.am index 6528c9779c..c54ebdc9e7 100644 --- a/src/acl/external/Makefile.am +++ b/src/acl/external/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/SQL_session/Makefile.am b/src/acl/external/SQL_session/Makefile.am index 28fb0431c4..f8560e7172 100644 --- a/src/acl/external/SQL_session/Makefile.am +++ b/src/acl/external/SQL_session/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/SQL_session/ext_sql_session_acl.pl.in b/src/acl/external/SQL_session/ext_sql_session_acl.pl.in index 9fcdba40d7..69af7a72aa 100755 --- a/src/acl/external/SQL_session/ext_sql_session_acl.pl.in +++ b/src/acl/external/SQL_session/ext_sql_session_acl.pl.in @@ -80,7 +80,7 @@ With assistance of Nishant Sharma =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/SQL_session/required.m4 b/src/acl/external/SQL_session/required.m4 index 729c1bbec6..eb815ae17d 100755 --- a/src/acl/external/SQL_session/required.m4 +++ b/src/acl/external/SQL_session/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/delayer/Makefile.am b/src/acl/external/delayer/Makefile.am index 85c9fbb234..d6dc640edb 100644 --- a/src/acl/external/delayer/Makefile.am +++ b/src/acl/external/delayer/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/delayer/ext_delayer_acl.pl.in b/src/acl/external/delayer/ext_delayer_acl.pl.in index a98c713d80..44fbf9f969 100755 --- a/src/acl/external/delayer/ext_delayer_acl.pl.in +++ b/src/acl/external/delayer/ext_delayer_acl.pl.in @@ -74,7 +74,7 @@ This software is written by Francesco Chemolli =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/delayer/required.m4 b/src/acl/external/delayer/required.m4 index b1da53da41..01c9ed7a86 100755 --- a/src/acl/external/delayer/required.m4 +++ b/src/acl/external/delayer/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/eDirectory_userip/Makefile.am b/src/acl/external/eDirectory_userip/Makefile.am index 282e2575b2..5f7077e948 100644 --- a/src/acl/external/eDirectory_userip/Makefile.am +++ b/src/acl/external/eDirectory_userip/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.8 b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.8 index 0733dc598d..082f6d39c0 100644 --- a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.8 +++ b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.8 @@ -192,7 +192,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc index c9eacb81fc..300ecb18e4 100644 --- a/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc +++ b/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/eDirectory_userip/required.m4 b/src/acl/external/eDirectory_userip/required.m4 index 0128fbdade..3d78cabdfe 100644 --- a/src/acl/external/eDirectory_userip/required.m4 +++ b/src/acl/external/eDirectory_userip/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/file_userip/Makefile.am b/src/acl/external/file_userip/Makefile.am index e6afd86b17..fd74f3d5d9 100644 --- a/src/acl/external/file_userip/Makefile.am +++ b/src/acl/external/file_userip/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/file_userip/example.conf b/src/acl/external/file_userip/example.conf index fc2245fce4..e0f8cc9ac8 100644 --- a/src/acl/external/file_userip/example.conf +++ b/src/acl/external/file_userip/example.conf @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/file_userip/ext_file_userip_acl.8 b/src/acl/external/file_userip/ext_file_userip_acl.8 index 6acaabf8ff..61da06a46f 100644 --- a/src/acl/external/file_userip/ext_file_userip_acl.8 +++ b/src/acl/external/file_userip/ext_file_userip_acl.8 @@ -80,7 +80,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/file_userip/ext_file_userip_acl.cc b/src/acl/external/file_userip/ext_file_userip_acl.cc index 36c8c87fd8..66d98179fb 100644 --- a/src/acl/external/file_userip/ext_file_userip_acl.cc +++ b/src/acl/external/file_userip/ext_file_userip_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/file_userip/required.m4 b/src/acl/external/file_userip/required.m4 index ef001da77d..163b5b85ac 100755 --- a/src/acl/external/file_userip/required.m4 +++ b/src/acl/external/file_userip/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/helpers.m4 b/src/acl/external/helpers.m4 index fb8ee236f8..7244b710c2 100644 --- a/src/acl/external/helpers.m4 +++ b/src/acl/external/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/Makefile.am b/src/acl/external/kerberos_ldap_group/Makefile.am index 0581d2ec29..44df7e365b 100644 --- a/src/acl/external/kerberos_ldap_group/Makefile.am +++ b/src/acl/external/kerberos_ldap_group/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/cert_tool b/src/acl/external/kerberos_ldap_group/cert_tool index 51cc0375a6..1f933741f3 100644 --- a/src/acl/external/kerberos_ldap_group/cert_tool +++ b/src/acl/external/kerberos_ldap_group/cert_tool @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc b/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc index eb86d550f2..8df3e2693a 100644 --- a/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc +++ b/src/acl/external/kerberos_ldap_group/kerberos_ldap_group.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/required.m4 b/src/acl/external/kerberos_ldap_group/required.m4 index aca58154cd..4a8a17614f 100644 --- a/src/acl/external/kerberos_ldap_group/required.m4 +++ b/src/acl/external/kerberos_ldap_group/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support.h b/src/acl/external/kerberos_ldap_group/support.h index 2d9803f2d5..846bd84da0 100644 --- a/src/acl/external/kerberos_ldap_group/support.h +++ b/src/acl/external/kerberos_ldap_group/support.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support_group.cc b/src/acl/external/kerberos_ldap_group/support_group.cc index 345b73edac..711b1d6066 100644 --- a/src/acl/external/kerberos_ldap_group/support_group.cc +++ b/src/acl/external/kerberos_ldap_group/support_group.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support_krb5.cc b/src/acl/external/kerberos_ldap_group/support_krb5.cc index abcd18bc2c..a0e76cc0c1 100644 --- a/src/acl/external/kerberos_ldap_group/support_krb5.cc +++ b/src/acl/external/kerberos_ldap_group/support_krb5.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support_ldap.cc b/src/acl/external/kerberos_ldap_group/support_ldap.cc index 0a00520472..abf42fa9c5 100644 --- a/src/acl/external/kerberos_ldap_group/support_ldap.cc +++ b/src/acl/external/kerberos_ldap_group/support_ldap.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support_log.cc b/src/acl/external/kerberos_ldap_group/support_log.cc index b98a456790..08ff075498 100644 --- a/src/acl/external/kerberos_ldap_group/support_log.cc +++ b/src/acl/external/kerberos_ldap_group/support_log.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support_lserver.cc b/src/acl/external/kerberos_ldap_group/support_lserver.cc index 0d88f75c4f..c0af31eada 100644 --- a/src/acl/external/kerberos_ldap_group/support_lserver.cc +++ b/src/acl/external/kerberos_ldap_group/support_lserver.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support_member.cc b/src/acl/external/kerberos_ldap_group/support_member.cc index 224a1f3b37..221c991454 100644 --- a/src/acl/external/kerberos_ldap_group/support_member.cc +++ b/src/acl/external/kerberos_ldap_group/support_member.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support_netbios.cc b/src/acl/external/kerberos_ldap_group/support_netbios.cc index 3ecdee253f..4edfef50d9 100644 --- a/src/acl/external/kerberos_ldap_group/support_netbios.cc +++ b/src/acl/external/kerberos_ldap_group/support_netbios.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support_resolv.cc b/src/acl/external/kerberos_ldap_group/support_resolv.cc index 07f2904f2b..ee7ca3de7f 100644 --- a/src/acl/external/kerberos_ldap_group/support_resolv.cc +++ b/src/acl/external/kerberos_ldap_group/support_resolv.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_ldap_group/support_sasl.cc b/src/acl/external/kerberos_ldap_group/support_sasl.cc index 831449920b..61d531f7ea 100644 --- a/src/acl/external/kerberos_ldap_group/support_sasl.cc +++ b/src/acl/external/kerberos_ldap_group/support_sasl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_sid_group/Makefile.am b/src/acl/external/kerberos_sid_group/Makefile.am index 7eed9559a1..ded831ae86 100644 --- a/src/acl/external/kerberos_sid_group/Makefile.am +++ b/src/acl/external/kerberos_sid_group/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.pl.in b/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.pl.in index 925c585e47..257ba6d167 100755 --- a/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.pl.in +++ b/src/acl/external/kerberos_sid_group/ext_kerberos_sid_group_acl.pl.in @@ -79,7 +79,7 @@ This manual was written by Markus Moeller =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/kerberos_sid_group/required.m4 b/src/acl/external/kerberos_sid_group/required.m4 index c8e89eb990..f7965dbe0d 100755 --- a/src/acl/external/kerberos_sid_group/required.m4 +++ b/src/acl/external/kerberos_sid_group/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/session/Makefile.am b/src/acl/external/session/Makefile.am index b64095fa67..ed452042ea 100644 --- a/src/acl/external/session/Makefile.am +++ b/src/acl/external/session/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/session/ext_session_acl.8 b/src/acl/external/session/ext_session_acl.8 index 89785ac453..1f65b59e77 100644 --- a/src/acl/external/session/ext_session_acl.8 +++ b/src/acl/external/session/ext_session_acl.8 @@ -99,7 +99,7 @@ This program and documentation was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/session/ext_session_acl.cc b/src/acl/external/session/ext_session_acl.cc index 5c7530daf8..f25277f105 100644 --- a/src/acl/external/session/ext_session_acl.cc +++ b/src/acl/external/session/ext_session_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/session/required.m4 b/src/acl/external/session/required.m4 index fef0dcda67..23f6512a13 100755 --- a/src/acl/external/session/required.m4 +++ b/src/acl/external/session/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/time_quota/Makefile.am b/src/acl/external/time_quota/Makefile.am index 3d7852b3e8..e0e7a46eb8 100644 --- a/src/acl/external/time_quota/Makefile.am +++ b/src/acl/external/time_quota/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/time_quota/ext_time_quota_acl.8 b/src/acl/external/time_quota/ext_time_quota_acl.8 index 88cf313acd..daf899f583 100644 --- a/src/acl/external/time_quota/ext_time_quota_acl.8 +++ b/src/acl/external/time_quota/ext_time_quota_acl.8 @@ -217,7 +217,7 @@ This program and documentation was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/time_quota/ext_time_quota_acl.cc b/src/acl/external/time_quota/ext_time_quota_acl.cc index 7b4edb940b..8b6e4f3f25 100644 --- a/src/acl/external/time_quota/ext_time_quota_acl.cc +++ b/src/acl/external/time_quota/ext_time_quota_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/time_quota/required.m4 b/src/acl/external/time_quota/required.m4 index 70007a87ca..046707dafc 100644 --- a/src/acl/external/time_quota/required.m4 +++ b/src/acl/external/time_quota/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/unix_group/Makefile.am b/src/acl/external/unix_group/Makefile.am index 0376a896b7..224594120c 100644 --- a/src/acl/external/unix_group/Makefile.am +++ b/src/acl/external/unix_group/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/unix_group/check_group.cc b/src/acl/external/unix_group/check_group.cc index 92eceb48f2..39192ccb53 100644 --- a/src/acl/external/unix_group/check_group.cc +++ b/src/acl/external/unix_group/check_group.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/unix_group/ext_unix_group_acl.8 b/src/acl/external/unix_group/ext_unix_group_acl.8 index 8f23443f94..ed780b8ab6 100644 --- a/src/acl/external/unix_group/ext_unix_group_acl.8 +++ b/src/acl/external/unix_group/ext_unix_group_acl.8 @@ -72,7 +72,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/unix_group/required.m4 b/src/acl/external/unix_group/required.m4 index 191942f23e..4ae5a6dea1 100755 --- a/src/acl/external/unix_group/required.m4 +++ b/src/acl/external/unix_group/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/wbinfo_group/Makefile.am b/src/acl/external/wbinfo_group/Makefile.am index 04ba28760f..a41bfb9461 100644 --- a/src/acl/external/wbinfo_group/Makefile.am +++ b/src/acl/external/wbinfo_group/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.pl.in b/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.pl.in index 95a542faca..a0126b6071 100755 --- a/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.pl.in +++ b/src/acl/external/wbinfo_group/ext_wbinfo_group_acl.pl.in @@ -62,7 +62,7 @@ This manual was written by Amos Jeffries =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/acl/external/wbinfo_group/required.m4 b/src/acl/external/wbinfo_group/required.m4 index 02e9d9165b..b87ee85073 100755 --- a/src/acl/external/wbinfo_group/required.m4 +++ b/src/acl/external/wbinfo_group/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/acl/forward.h b/src/acl/forward.h index 6ae09aae30..df24e92e81 100644 --- a/src/acl/forward.h +++ b/src/acl/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/AccessCheck.cc b/src/adaptation/AccessCheck.cc index 505a24315d..e32b507843 100644 --- a/src/adaptation/AccessCheck.cc +++ b/src/adaptation/AccessCheck.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -39,7 +39,7 @@ Adaptation::AccessCheck::Start(Method method, VectPoint vp, return true; } - debugs(83, 3, HERE << "adaptation off, skipping"); + debugs(83, 3, "adaptation off, skipping"); return false; } @@ -55,7 +55,7 @@ Adaptation::AccessCheck::AccessCheck(const ServiceFilter &aFilter, h->start("ACL"); #endif - debugs(93, 5, HERE << "AccessCheck constructed for " << + debugs(93, 5, "AccessCheck constructed for " << methodStr(filter.method) << " " << vectPointStr(filter.point)); } @@ -87,11 +87,11 @@ Adaptation::AccessCheck::usedDynamicRules() DynamicGroupCfg services; if (!ah->extractFutureServices(services)) { // clears history - debugs(85,9, HERE << "no service-proposed rules stored"); + debugs(85,9, "no service-proposed rules stored"); return false; // earlier service did not plan for the future } - debugs(85,3, HERE << "using stored service-proposed rules: " << services); + debugs(85,3, "using stored service-proposed rules: " << services); ServiceGroupPointer g = new DynamicServiceChain(services, filter); callBack(g); @@ -103,13 +103,13 @@ Adaptation::AccessCheck::usedDynamicRules() void Adaptation::AccessCheck::check() { - debugs(93, 4, HERE << "start checking"); + debugs(93, 4, "start checking"); typedef AccessRules::iterator ARI; for (ARI i = AllRules().begin(); i != AllRules().end(); ++i) { AccessRule *r = *i; if (isCandidate(*r)) { - debugs(93, 5, HERE << "check: rule '" << r->id << "' is a candidate"); + debugs(93, 5, "check: rule '" << r->id << "' is a candidate"); candidates.push_back(r->id); } } @@ -125,7 +125,7 @@ Adaptation::AccessCheck::check() void Adaptation::AccessCheck::checkCandidates() { - debugs(93, 4, HERE << "has " << candidates.size() << " rules"); + debugs(93, 4, "has " << candidates.size() << " rules"); while (!candidates.empty()) { if (AccessRule *r = FindRule(topCandidate())) { @@ -143,7 +143,7 @@ Adaptation::AccessCheck::checkCandidates() candidates.erase(candidates.begin()); // the rule apparently went away (reconfigure) } - debugs(93, 4, HERE << "NO candidates left"); + debugs(93, 4, "NO candidates left"); callBack(NULL); Must(done()); } @@ -151,7 +151,7 @@ Adaptation::AccessCheck::checkCandidates() void Adaptation::AccessCheck::AccessCheckCallbackWrapper(Acl::Answer answer, void *data) { - debugs(93, 8, HERE << "callback answer=" << answer); + debugs(93, 8, "callback answer=" << answer); AccessCheck *ac = (AccessCheck*)data; /* TODO: AYJ 2008-06-12: If answer == ACCESS_AUTH_REQUIRED @@ -173,7 +173,7 @@ void Adaptation::AccessCheck::noteAnswer(Acl::Answer answer) { Must(!candidates.empty()); // the candidate we were checking must be there - debugs(93,5, HERE << topCandidate() << " answer=" << answer); + debugs(93,5, topCandidate() << " answer=" << answer); if (answer.allowed()) { // the rule matched ServiceGroupPointer g = topGroup(); @@ -194,7 +194,7 @@ Adaptation::AccessCheck::noteAnswer(Acl::Answer answer) void Adaptation::AccessCheck::callBack(const ServiceGroupPointer &g) { - debugs(93,3, HERE << g); + debugs(93,3, g); CallJobHere1(93, 5, theInitiator, Adaptation::Initiator, noteAdaptationAclCheckDone, g); mustStop("done"); // called back or will never be able to call back @@ -207,12 +207,12 @@ Adaptation::AccessCheck::topGroup() const if (candidates.size()) { if (AccessRule *r = FindRule(topCandidate())) { g = FindGroup(r->groupId); - debugs(93,5, HERE << "top group for " << r->id << " is " << g); + debugs(93,5, "top group for " << r->id << " is " << g); } else { - debugs(93,5, HERE << "no rule for " << topCandidate()); + debugs(93,5, "no rule for " << topCandidate()); } } else { - debugs(93,5, HERE << "no candidates"); // should not happen + debugs(93,5, "no candidates"); // should not happen } return g; @@ -223,18 +223,18 @@ Adaptation::AccessCheck::topGroup() const bool Adaptation::AccessCheck::isCandidate(AccessRule &r) { - debugs(93,7,HERE << "checking candidacy of " << r.id << ", group " << + debugs(93,7, "checking candidacy of " << r.id << ", group " << r.groupId); ServiceGroupPointer g = FindGroup(r.groupId); if (!g) { - debugs(93,7,HERE << "lost " << r.groupId << " group in rule" << r.id); + debugs(93,7, "lost " << r.groupId << " group in rule" << r.id); return false; } const bool wants = g->wants(filter); - debugs(93,7,HERE << r.groupId << (wants ? " wants" : " ignores")); + debugs(93,7, r.groupId << (wants ? " wants" : " ignores")); return wants; } diff --git a/src/adaptation/AccessCheck.h b/src/adaptation/AccessCheck.h index aa57ec03d3..be4f6417c0 100644 --- a/src/adaptation/AccessCheck.h +++ b/src/adaptation/AccessCheck.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/AccessRule.cc b/src/adaptation/AccessRule.cc index d539725434..6a8fb8a487 100644 --- a/src/adaptation/AccessRule.cc +++ b/src/adaptation/AccessRule.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -36,7 +36,7 @@ void Adaptation::AccessRule::finalize() { if (!group()) { // no explicit group - debugs(93,7, HERE << "no service group: " << groupId); + debugs(93,7, "no service group: " << groupId); // try to add a one-service group if (FindService(groupId) != NULL) { ServiceGroupPointer g = new SingleService(groupId); diff --git a/src/adaptation/AccessRule.h b/src/adaptation/AccessRule.h index 7fad34321a..b9003b7c1f 100644 --- a/src/adaptation/AccessRule.h +++ b/src/adaptation/AccessRule.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Answer.cc b/src/adaptation/Answer.cc index d3258ac7f9..6c0816fe3c 100644 --- a/src/adaptation/Answer.cc +++ b/src/adaptation/Answer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -18,7 +18,7 @@ Adaptation::Answer::Error(bool final) { Answer answer(akError); answer.final = final; - debugs(93, 4, HERE << "error: " << final); + debugs(93, 4, "error: " << final); return answer; } @@ -27,7 +27,7 @@ Adaptation::Answer::Forward(Http::Message *aMsg) { Answer answer(akForward); answer.message = aMsg; - debugs(93, 4, HERE << "forwarding: " << (void*)aMsg); + debugs(93, 4, "forwarding: " << (void*)aMsg); return answer; } @@ -36,7 +36,7 @@ Adaptation::Answer::Block(const String &aRule) { Answer answer(akBlock); answer.ruleId = aRule; - debugs(93, 4, HERE << "blocking rule: " << aRule); + debugs(93, 4, "blocking rule: " << aRule); return answer; } diff --git a/src/adaptation/Answer.h b/src/adaptation/Answer.h index 0d33bfd6b1..c6c9f08a69 100644 --- a/src/adaptation/Answer.h +++ b/src/adaptation/Answer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc index 5a5288288f..114189ec81 100644 --- a/src/adaptation/Config.cc +++ b/src/adaptation/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -120,14 +120,14 @@ Adaptation::Config::removeRule(const String& id) void Adaptation::Config::clear() { - debugs(93, 3, HERE << "rules: " << AllRules().size() << ", groups: " << + debugs(93, 3, "rules: " << AllRules().size() << ", groups: " << AllGroups().size() << ", services: " << serviceConfigs.size()); typedef ServiceConfigs::const_iterator SCI; const ServiceConfigs& configs = serviceConfigs; for (SCI cfg = configs.begin(); cfg != configs.end(); ++cfg) removeService((*cfg)->key); serviceConfigs.clear(); - debugs(93, 3, HERE << "rules: " << AllRules().size() << ", groups: " << + debugs(93, 3, "rules: " << AllRules().size() << ", groups: " << AllGroups().size() << ", services: " << serviceConfigs.size()); } @@ -207,7 +207,7 @@ Adaptation::Config::finalize() } } - debugs(93,3, HERE << "Created " << created << " adaptation services"); + debugs(93,3, "Created " << created << " adaptation services"); // services remember their configs; we do not have to serviceConfigs.clear(); @@ -223,7 +223,7 @@ FinalizeEach(Collection &collection, const char *label) for (CI i = collection.begin(); i != collection.end(); ++i) (*i)->finalize(); - debugs(93,2, HERE << "Initialized " << collection.size() << ' ' << label); + debugs(93,2, "Initialized " << collection.size() << ' ' << label); } void diff --git a/src/adaptation/Config.h b/src/adaptation/Config.h index 103fb2a393..28916f4ef0 100644 --- a/src/adaptation/Config.h +++ b/src/adaptation/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/DynamicGroupCfg.cc b/src/adaptation/DynamicGroupCfg.cc index 4df512be75..97ecd12958 100644 --- a/src/adaptation/DynamicGroupCfg.cc +++ b/src/adaptation/DynamicGroupCfg.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/DynamicGroupCfg.h b/src/adaptation/DynamicGroupCfg.h index 1857b3a57f..1bb1163698 100644 --- a/src/adaptation/DynamicGroupCfg.h +++ b/src/adaptation/DynamicGroupCfg.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Elements.cc b/src/adaptation/Elements.cc index 85f4563f86..2006605193 100644 --- a/src/adaptation/Elements.cc +++ b/src/adaptation/Elements.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Elements.h b/src/adaptation/Elements.h index a555016d78..39aa20fb24 100644 --- a/src/adaptation/Elements.h +++ b/src/adaptation/Elements.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/History.cc b/src/adaptation/History.cc index 04c5e27a3d..228faddfbe 100644 --- a/src/adaptation/History.cc +++ b/src/adaptation/History.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -120,8 +120,8 @@ bool Adaptation::History::getXxRecord(String &name, String &value) const void Adaptation::History::updateNextServices(const String &services) { if (theNextServices != TheNullServices) - debugs(93,3, HERE << "old services: " << theNextServices); - debugs(93,3, HERE << "new services: " << services); + debugs(93,3, "old services: " << theNextServices); + debugs(93,3, "new services: " << services); Must(services != TheNullServices); theNextServices = services; } @@ -155,8 +155,8 @@ void Adaptation::History::setFutureServices(const DynamicGroupCfg &services) { if (!theFutureServices.empty()) - debugs(93,3, HERE << "old future services: " << theFutureServices); - debugs(93,3, HERE << "new future services: " << services); + debugs(93,3, "old future services: " << theFutureServices); + debugs(93,3, "new future services: " << services); theFutureServices = services; // may be empty } diff --git a/src/adaptation/History.h b/src/adaptation/History.h index e2a3095e61..045dd01a7e 100644 --- a/src/adaptation/History.h +++ b/src/adaptation/History.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Initiate.cc b/src/adaptation/Initiate.cc index 0187e3d793..38e1dd1165 100644 --- a/src/adaptation/Initiate.cc +++ b/src/adaptation/Initiate.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -61,14 +61,14 @@ Adaptation::Initiate::initiator(const CbcPointer &i) // internal cleanup void Adaptation::Initiate::swanSong() { - debugs(93, 5, HERE << "swan sings" << status()); + debugs(93, 5, "swan sings" << status()); if (theInitiator.set()) { - debugs(93, 3, HERE << "fatal failure; sending abort notification"); + debugs(93, 3, "fatal failure; sending abort notification"); tellQueryAborted(true); // final by default } - debugs(93, 5, HERE << "swan sang" << status()); + debugs(93, 5, "swan sang" << status()); } void Adaptation::Initiate::clearInitiator() diff --git a/src/adaptation/Initiate.h b/src/adaptation/Initiate.h index 5fff7ffb50..0e8b3ac5a0 100644 --- a/src/adaptation/Initiate.h +++ b/src/adaptation/Initiate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Initiator.cc b/src/adaptation/Initiator.cc index 31e3c9a5ef..5af7d09b28 100644 --- a/src/adaptation/Initiator.cc +++ b/src/adaptation/Initiator.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Initiator.h b/src/adaptation/Initiator.h index 78a1de631a..d1f92f0868 100644 --- a/src/adaptation/Initiator.h +++ b/src/adaptation/Initiator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Iterator.cc b/src/adaptation/Iterator.cc index b223363634..7210dafe54 100644 --- a/src/adaptation/Iterator.cc +++ b/src/adaptation/Iterator.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -71,7 +71,7 @@ void Adaptation::Iterator::start() void Adaptation::Iterator::step() { ++iterations; - debugs(93,5, HERE << '#' << iterations << " plan: " << thePlan); + debugs(93,5, '#' << iterations << " plan: " << thePlan); Must(!theLauncher); @@ -97,7 +97,7 @@ void Adaptation::Iterator::step() ServicePointer service = thePlan.current(); Must(service != NULL); - debugs(93,5, HERE << "using adaptation service: " << service->cfg().key); + debugs(93,5, "using adaptation service: " << service->cfg().key); if (Adaptation::Config::needHistory) { Adaptation::History::Pointer ah = request->adaptHistory(true); @@ -139,7 +139,7 @@ Adaptation::Iterator::handleAdaptedHeader(Http::Message *aMsg) // definitely sent request, now use it as the cause theCause = cause; // moving the lock theMsg = 0; - debugs(93,3, HERE << "in request satisfaction mode"); + debugs(93,3, "in request satisfaction mode"); } } } @@ -165,7 +165,7 @@ void Adaptation::Iterator::noteInitiatorAborted() void Adaptation::Iterator::handleAdaptationBlock(const Answer &answer) { - debugs(93,5, HERE << "blocked by " << answer); + debugs(93,5, "blocked by " << answer); clearAdaptation(theLauncher); updatePlan(false); sendAnswer(answer); @@ -174,7 +174,7 @@ void Adaptation::Iterator::handleAdaptationBlock(const Answer &answer) void Adaptation::Iterator::handleAdaptationError(bool final) { - debugs(93,5, HERE << "final: " << final << " plan: " << thePlan); + debugs(93,5, "final: " << final << " plan: " << thePlan); clearAdaptation(theLauncher); updatePlan(false); @@ -184,18 +184,18 @@ void Adaptation::Iterator::handleAdaptationError(bool final) // can we ignore the failure (compute while thePlan is not exhausted)? Must(!thePlan.exhausted()); const bool canIgnore = thePlan.current()->cfg().bypass; - debugs(85,5, HERE << "flags: " << srcIntact << canIgnore << adapted); + debugs(85,5, "flags: " << srcIntact << canIgnore << adapted); if (srcIntact) { if (thePlan.replacement(filter()) != NULL) { - debugs(93,3, HERE << "trying a replacement service"); + debugs(93,3, "trying a replacement service"); step(); return; } } if (canIgnore && srcIntact && adapted) { - debugs(85,3, HERE << "responding with older adapted msg"); + debugs(85,3, "responding with older adapted msg"); sendAnswer(Answer::Forward(theMsg)); mustStop("sent older adapted msg"); return; @@ -230,22 +230,22 @@ bool Adaptation::Iterator::updatePlan(bool adopt) Adaptation::History::Pointer ah = r->adaptHistory(); if (!ah) { - debugs(85,9, HERE << "no history to store a service-proposed plan"); + debugs(85,9, "no history to store a service-proposed plan"); return false; // the feature is not enabled or is not triggered } String services; if (!ah->extractNextServices(services)) { // clears history - debugs(85,9, HERE << "no service-proposed plan received"); + debugs(85,9, "no service-proposed plan received"); return false; // the service did not provide a new plan } if (!adopt) { - debugs(85,3, HERE << "rejecting service-proposed plan"); + debugs(85,3, "rejecting service-proposed plan"); return false; } - debugs(85,3, HERE << "retiring old plan: " << thePlan); + debugs(85,3, "retiring old plan: " << thePlan); Adaptation::ServiceFilter f = this->filter(); DynamicGroupCfg current, future; @@ -253,13 +253,13 @@ bool Adaptation::Iterator::updatePlan(bool adopt) if (!future.empty()) { ah->setFutureServices(future); - debugs(85,3, HERE << "noted future service-proposed plan: " << future); + debugs(85,3, "noted future service-proposed plan: " << future); } // use the current config even if it is empty; we must replace the old plan theGroup = new DynamicServiceChain(current, f); // refcounted thePlan = ServicePlan(theGroup, f); - debugs(85,3, HERE << "adopted service-proposed plan: " << thePlan); + debugs(85,3, "adopted service-proposed plan: " << thePlan); return true; } diff --git a/src/adaptation/Iterator.h b/src/adaptation/Iterator.h index 2f8f410a0d..c4ee54be84 100644 --- a/src/adaptation/Iterator.h +++ b/src/adaptation/Iterator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am index 64a94727fd..7f9d8dd571 100644 --- a/src/adaptation/Makefile.am +++ b/src/adaptation/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/adaptation/Message.cc b/src/adaptation/Message.cc index 59aea4a575..fae59a836e 100644 --- a/src/adaptation/Message.cc +++ b/src/adaptation/Message.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Message.h b/src/adaptation/Message.h index 5c2cbc9601..fb5737c394 100644 --- a/src/adaptation/Message.h +++ b/src/adaptation/Message.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/Service.cc b/src/adaptation/Service.cc index 9a5a85e719..73974d8aea 100644 --- a/src/adaptation/Service.cc +++ b/src/adaptation/Service.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -16,7 +16,7 @@ Adaptation::Service::Service(const ServiceConfigPointer &aConfig): theConfig(aConfig) { Must(theConfig != NULL); - debugs(93,3, HERE << "creating adaptation service " << cfg().key); + debugs(93,3, "creating adaptation service " << cfg().key); } Adaptation::Service::~Service() diff --git a/src/adaptation/Service.h b/src/adaptation/Service.h index 0b2ee24b81..10d98b4d63 100644 --- a/src/adaptation/Service.h +++ b/src/adaptation/Service.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ServiceConfig.cc b/src/adaptation/ServiceConfig.cc index edbf5c55fc..30e09e24d9 100644 --- a/src/adaptation/ServiceConfig.cc +++ b/src/adaptation/ServiceConfig.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -193,7 +193,7 @@ Adaptation::ServiceConfig::grokUri(const char *value) // AYJ: most of this is duplicate of AnyP::Uri::parse() if (!value || !*value) { - debugs(3, DBG_CRITICAL, HERE << cfg_filename << ':' << config_lineno << ": " << + debugs(3, DBG_CRITICAL, cfg_filename << ':' << config_lineno << ": " << "empty adaptation service URI"); return false; } @@ -206,7 +206,7 @@ Adaptation::ServiceConfig::grokUri(const char *value) if (schemeEnd != String::npos) protocol=uri.substr(0,schemeEnd); - debugs(3, 5, HERE << cfg_filename << ':' << config_lineno << ": " << + debugs(3, 5, cfg_filename << ':' << config_lineno << ": " << "service protocol is " << protocol); if (protocol.size() == 0) @@ -282,7 +282,7 @@ Adaptation::ServiceConfig::grokUri(const char *value) len = e - s; if (len > 1024) { - debugs(3, DBG_CRITICAL, HERE << cfg_filename << ':' << config_lineno << ": " << + debugs(3, DBG_CRITICAL, cfg_filename << ':' << config_lineno << ": " << "long resource name (>1024), probably wrong"); } @@ -298,7 +298,7 @@ Adaptation::ServiceConfig::grokBool(bool &var, const char *name, const char *val else if (!strcmp(value, "1") || !strcmp(value, "on")) var = true; else { - debugs(3, DBG_CRITICAL, HERE << cfg_filename << ':' << config_lineno << ": " << + debugs(3, DBG_CRITICAL, cfg_filename << ':' << config_lineno << ": " << "wrong value for boolean " << name << "; " << "'0', '1', 'on', or 'off' expected but got: " << value); return false; diff --git a/src/adaptation/ServiceConfig.h b/src/adaptation/ServiceConfig.h index 00a9b8a9e5..c82e1c495c 100644 --- a/src/adaptation/ServiceConfig.h +++ b/src/adaptation/ServiceConfig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ServiceFilter.cc b/src/adaptation/ServiceFilter.cc index 28d14ff0fa..3d24133b07 100644 --- a/src/adaptation/ServiceFilter.cc +++ b/src/adaptation/ServiceFilter.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ServiceFilter.h b/src/adaptation/ServiceFilter.h index 54b18f3e12..8af65ed6da 100644 --- a/src/adaptation/ServiceFilter.h +++ b/src/adaptation/ServiceFilter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ServiceGroups.cc b/src/adaptation/ServiceGroups.cc index 3b69925158..42ad096898 100644 --- a/src/adaptation/ServiceGroups.cc +++ b/src/adaptation/ServiceGroups.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -93,7 +93,7 @@ Adaptation::ServiceGroup::finalize() finalizeMsg("ERROR: Unknown adaptation name", serviceId, true); } } - debugs(93,7, HERE << "finalized " << kind << ": " << id); + debugs(93,7, "finalized " << kind << ": " << id); } /// checks that the service name or URI is not repeated later in the group @@ -141,7 +141,7 @@ bool Adaptation::ServiceGroup::findService(const ServiceFilter &filter, Pos &pos) const { if (method != filter.method || point != filter.point) { - debugs(93,5,HERE << id << " serves another location"); + debugs(93,5, id << " serves another location"); return false; // assume other services have the same wrong location } @@ -149,7 +149,7 @@ Adaptation::ServiceGroup::findService(const ServiceFilter &filter, Pos &pos) con bool foundEssential = false; Pos essPos = 0; for (; has(pos); ++pos) { - debugs(93,9,HERE << id << " checks service at " << pos); + debugs(93,9, id << " checks service at " << pos); ServicePointer service = at(pos); if (!service) @@ -159,34 +159,34 @@ Adaptation::ServiceGroup::findService(const ServiceFilter &filter, Pos &pos) con continue; // the service is not interested if (service->up() || !service->probed()) { - debugs(93,9,HERE << id << " has matching service at " << pos); + debugs(93,9, id << " has matching service at " << pos); return true; } if (service->cfg().bypass) { // we can safely ignore bypassable downers - debugs(93,9,HERE << id << " has bypassable service at " << pos); + debugs(93,9, id << " has bypassable service at " << pos); continue; } if (!allServicesSame) { // cannot skip (i.e., find best) service - debugs(93,9,HERE << id << " has essential service at " << pos); + debugs(93,9, id << " has essential service at " << pos); return true; } if (!foundEssential) { - debugs(93,9,HERE << id << " searches for best essential service from " << pos); + debugs(93,9, id << " searches for best essential service from " << pos); foundEssential = true; essPos = pos; } } if (foundEssential) { - debugs(93,9,HERE << id << " has best essential service at " << essPos); + debugs(93,9, id << " has best essential service at " << essPos); pos = essPos; return true; } - debugs(93,5,HERE << id << " has no matching services"); + debugs(93,5, id << " has no matching services"); return false; } diff --git a/src/adaptation/ServiceGroups.h b/src/adaptation/ServiceGroups.h index f8849d6276..c2d7fb3e09 100644 --- a/src/adaptation/ServiceGroups.h +++ b/src/adaptation/ServiceGroups.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/Config.cc b/src/adaptation/ecap/Config.cc index 79a90d242f..002b8fc185 100644 --- a/src/adaptation/ecap/Config.cc +++ b/src/adaptation/ecap/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/Config.h b/src/adaptation/ecap/Config.h index a56fda7a2d..dfaa93527a 100644 --- a/src/adaptation/ecap/Config.h +++ b/src/adaptation/ecap/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/Host.cc b/src/adaptation/ecap/Host.cc index 33fbb5adbf..edb55de0b3 100644 --- a/src/adaptation/ecap/Host.cc +++ b/src/adaptation/ecap/Host.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/Host.h b/src/adaptation/ecap/Host.h index 545e029cd8..82c71e9f1a 100644 --- a/src/adaptation/ecap/Host.h +++ b/src/adaptation/ecap/Host.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/Makefile.am b/src/adaptation/ecap/Makefile.am index 45f3302691..1575b76b0e 100644 --- a/src/adaptation/ecap/Makefile.am +++ b/src/adaptation/ecap/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc index 618dda0840..c5ade9ca0c 100644 --- a/src/adaptation/ecap/MessageRep.cc +++ b/src/adaptation/ecap/MessageRep.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/MessageRep.h b/src/adaptation/ecap/MessageRep.h index f93b3798fb..d91a9dd1a6 100644 --- a/src/adaptation/ecap/MessageRep.h +++ b/src/adaptation/ecap/MessageRep.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/MinimalAdapter.cc b/src/adaptation/ecap/MinimalAdapter.cc index 53caca71b1..1bdefd75de 100644 --- a/src/adaptation/ecap/MinimalAdapter.cc +++ b/src/adaptation/ecap/MinimalAdapter.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/Registry.h b/src/adaptation/ecap/Registry.h index d5ba384791..24e48a82f1 100644 --- a/src/adaptation/ecap/Registry.h +++ b/src/adaptation/ecap/Registry.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc index 4a1611709b..c20ab896fe 100644 --- a/src/adaptation/ecap/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -194,7 +194,7 @@ Adaptation::Ecap::ServiceRep::finalize() void Adaptation::Ecap::ServiceRep::tryConfigureAndStart() { - debugs(93,2, HERE << "configuring eCAP service: " << theService->uri()); + debugs(93,2, "configuring eCAP service: " << theService->uri()); const ConfigRep cfgRep(dynamic_cast(cfg())); theService->configure(cfgRep); diff --git a/src/adaptation/ecap/ServiceRep.h b/src/adaptation/ecap/ServiceRep.h index 5d9f2c4198..30b0d3c794 100644 --- a/src/adaptation/ecap/ServiceRep.h +++ b/src/adaptation/ecap/ServiceRep.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc index ea0795a737..8a5edc89c4 100644 --- a/src/adaptation/ecap/XactionRep.cc +++ b/src/adaptation/ecap/XactionRep.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -351,7 +351,7 @@ Adaptation::Ecap::XactionRep::doneAll() const void Adaptation::Ecap::XactionRep::sinkVb(const char *reason) { - debugs(93,4, HERE << "sink for " << reason << "; status:" << status()); + debugs(93,4, "sink for " << reason << "; status:" << status()); // we reset raw().body_pipe when we are done, so use this one for checking const BodyPipePointer &permPipe = theVirginRep.raw().header->body_pipe; @@ -365,7 +365,7 @@ Adaptation::Ecap::XactionRep::sinkVb(const char *reason) void Adaptation::Ecap::XactionRep::preserveVb(const char *reason) { - debugs(93,4, HERE << "preserve for " << reason << "; status:" << status()); + debugs(93,4, "preserve for " << reason << "; status:" << status()); // we reset raw().body_pipe when we are done, so use this one for checking const BodyPipePointer &permPipe = theVirginRep.raw().header->body_pipe; @@ -381,7 +381,7 @@ Adaptation::Ecap::XactionRep::preserveVb(const char *reason) void Adaptation::Ecap::XactionRep::forgetVb(const char *reason) { - debugs(93,9, HERE << "forget vb " << reason << "; status:" << status()); + debugs(93,9, "forget vb " << reason << "; status:" << status()); BodyPipePointer &p = theVirginRep.raw().body_pipe; if (p != NULL && p->stillConsuming(this)) @@ -396,7 +396,7 @@ Adaptation::Ecap::XactionRep::forgetVb(const char *reason) void Adaptation::Ecap::XactionRep::useVirgin() { - debugs(93,3, HERE << status()); + debugs(93,3, status()); Must(proxyingAb == opUndecided); proxyingAb = opNever; @@ -414,7 +414,7 @@ Adaptation::Ecap::XactionRep::useVirgin() void Adaptation::Ecap::XactionRep::useAdapted(const libecap::shared_ptr &m) { - debugs(93,3, HERE << status()); + debugs(93,3, status()); Must(m); theAnswerRep = m; Must(proxyingAb == opUndecided); @@ -436,7 +436,7 @@ Adaptation::Ecap::XactionRep::useAdapted(const libecap::shared_ptrabMake(); // libecap will produce } } @@ -444,7 +444,7 @@ Adaptation::Ecap::XactionRep::useAdapted(const libecap::shared_ptrabContent(0, libecap::nsize); - debugs(93,5, HERE << "up to " << c.size << " bytes"); + debugs(93,5, "up to " << c.size << " bytes"); if (c.size == 0 && abProductionFinished) { // no ab now and in the future stopProducingFor(answer().body_pipe, abProductionAtEnd); proxyingAb = opComplete; - debugs(93,5, HERE << "last adapted body data retrieved"); + debugs(93,5, "last adapted body data retrieved"); } else if (c.size > 0) { if (const size_t used = answer().body_pipe->putMoreData(c.start, c.size)) theMaster->abContentShift(used); diff --git a/src/adaptation/ecap/XactionRep.h b/src/adaptation/ecap/XactionRep.h index c175e351f7..84ec2f79d8 100644 --- a/src/adaptation/ecap/XactionRep.h +++ b/src/adaptation/ecap/XactionRep.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/forward.h b/src/adaptation/forward.h index 5d20062b91..4840bd323d 100644 --- a/src/adaptation/forward.h +++ b/src/adaptation/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/Client.cc b/src/adaptation/icap/Client.cc index 3cabebd09a..8b4684ce64 100644 --- a/src/adaptation/icap/Client.cc +++ b/src/adaptation/icap/Client.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -12,7 +12,7 @@ void Adaptation::Icap::InitModule() { - debugs(93,2, HERE << "module enabled."); + debugs(93,2, "module enabled."); } void Adaptation::Icap::CleanModule() diff --git a/src/adaptation/icap/Client.h b/src/adaptation/icap/Client.h index 7e79579d49..b1a7ffa38a 100644 --- a/src/adaptation/icap/Client.h +++ b/src/adaptation/icap/Client.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/Config.cc b/src/adaptation/icap/Config.cc index b0c0f46d89..efddde3938 100644 --- a/src/adaptation/icap/Config.cc +++ b/src/adaptation/icap/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/Config.h b/src/adaptation/icap/Config.h index 21e23b0abc..5935f8f759 100644 --- a/src/adaptation/icap/Config.h +++ b/src/adaptation/icap/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/Elements.cc b/src/adaptation/icap/Elements.cc index 201679ebcf..eb01998584 100644 --- a/src/adaptation/icap/Elements.cc +++ b/src/adaptation/icap/Elements.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/Elements.h b/src/adaptation/icap/Elements.h index b0e604a127..71e2e81a9d 100644 --- a/src/adaptation/icap/Elements.h +++ b/src/adaptation/icap/Elements.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/History.cc b/src/adaptation/icap/History.cc index 2e53c8251a..a88bccb0e0 100644 --- a/src/adaptation/icap/History.cc +++ b/src/adaptation/icap/History.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -25,7 +25,7 @@ void Adaptation::Icap::History::start(const char *context) if (!concurrencyLevel++) currentStart = current_time; - debugs(93,4, HERE << "start " << context << " level=" << concurrencyLevel + debugs(93,4, "start " << context << " level=" << concurrencyLevel << " time=" << tvToMsec(pastTime) << ' ' << this); } @@ -38,7 +38,7 @@ void Adaptation::Icap::History::stop(const char *context) struct timeval current; currentTime(current); - debugs(93,4, HERE << "stop " << context << " level=" << concurrencyLevel << + debugs(93,4, "stop " << context << " level=" << concurrencyLevel << " time=" << tvToMsec(pastTime) << '+' << tvToMsec(current) << ' ' << this); if (!--concurrencyLevel) @@ -50,7 +50,7 @@ Adaptation::Icap::History::processingTime(timeval &total) const { currentTime(total); tvAssignAdd(total, pastTime); - debugs(93,7, HERE << " current total: " << tvToMsec(total) << ' ' << this); + debugs(93,7, " current total: " << tvToMsec(total) << ' ' << this); } void diff --git a/src/adaptation/icap/History.h b/src/adaptation/icap/History.h index cdb25b7d1f..8f4f155c03 100644 --- a/src/adaptation/icap/History.h +++ b/src/adaptation/icap/History.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/InOut.h b/src/adaptation/icap/InOut.h index 5c1348e3ab..8e689c411b 100644 --- a/src/adaptation/icap/InOut.h +++ b/src/adaptation/icap/InOut.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/Launcher.cc b/src/adaptation/icap/Launcher.cc index a38756165a..9d5d8d7a5a 100644 --- a/src/adaptation/icap/Launcher.cc +++ b/src/adaptation/icap/Launcher.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -44,7 +44,7 @@ void Adaptation::Icap::Launcher::launchXaction(const char *xkind) { Must(!theXaction); ++theLaunches; - debugs(93,4, HERE << "launching " << xkind << " xaction #" << theLaunches); + debugs(93,4, "launching " << xkind << " xaction #" << theLaunches); Adaptation::Icap::Xaction *x = createXaction(); x->attempts = theLaunches; if (theLaunches > 1) { @@ -59,7 +59,7 @@ void Adaptation::Icap::Launcher::launchXaction(const char *xkind) void Adaptation::Icap::Launcher::noteAdaptationAnswer(const Answer &answer) { - debugs(93,5, HERE << "launches: " << theLaunches << " answer: " << answer); + debugs(93,5, "launches: " << theLaunches << " answer: " << answer); // XXX: akError is unused by ICAPXaction in favor of noteXactAbort() Must(answer.kind != Answer::akError); @@ -80,7 +80,7 @@ void Adaptation::Icap::Launcher::noteInitiatorAborted() void Adaptation::Icap::Launcher::noteXactAbort(XactAbortInfo info) { - debugs(93,5, HERE << "theXaction:" << theXaction << " launches: " << theLaunches); + debugs(93,5, "theXaction:" << theXaction << " launches: " << theLaunches); // TODO: add more checks from FwdState::checkRetry()? if (canRetry(info)) { @@ -90,7 +90,7 @@ void Adaptation::Icap::Launcher::noteXactAbort(XactAbortInfo info) clearAdaptation(theXaction); launchXaction("repeat"); } else { - debugs(93,3, HERE << "cannot retry or repeat a failed transaction"); + debugs(93,3, "cannot retry or repeat a failed transaction"); clearAdaptation(theXaction); tellQueryAborted(false); // caller decides based on bypass, consumption Must(done()); @@ -122,15 +122,15 @@ bool Adaptation::Icap::Launcher::canRetry(Adaptation::Icap::XactAbortInfo &info) bool Adaptation::Icap::Launcher::canRepeat(Adaptation::Icap::XactAbortInfo &info) const { - debugs(93,9, HERE << shutting_down); + debugs(93,9, shutting_down); if (theLaunches >= TheConfig.repeat_limit || shutting_down) return false; - debugs(93,9, HERE << info.isRepeatable); // TODO: update and use status() + debugs(93,9, info.isRepeatable); // TODO: update and use status() if (!info.isRepeatable) return false; - debugs(93,9, HERE << info.icapReply); + debugs(93,9, info.icapReply); if (!info.icapReply) // did not get to read an ICAP reply; a timeout? return true; diff --git a/src/adaptation/icap/Launcher.h b/src/adaptation/icap/Launcher.h index 6936115c86..20f632debe 100644 --- a/src/adaptation/icap/Launcher.h +++ b/src/adaptation/icap/Launcher.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/Makefile.am b/src/adaptation/icap/Makefile.am index 08d0a62122..b9b0c5ea92 100644 --- a/src/adaptation/icap/Makefile.am +++ b/src/adaptation/icap/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc index e16314c889..e62d2c3c49 100644 --- a/src/adaptation/icap/ModXact.cc +++ b/src/adaptation/icap/ModXact.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -82,7 +82,7 @@ Adaptation::Icap::ModXact::ModXact(Http::Message *virginHeader, icapReply = new HttpReply; icapReply->protoPrefix = "ICAP/"; // TODO: make an IcapReply class? - debugs(93,7, HERE << "initialized." << status()); + debugs(93,7, "initialized." << status()); } // initiator wants us to start @@ -132,7 +132,7 @@ void Adaptation::Icap::ModXact::waitForService() disableRetries(); disableRepeats("ICAP service is not available"); - debugs(93, 7, HERE << "will not wait for the service to be available" << + debugs(93, 7, "will not wait for the service to be available" << status()); throw TexcHere("ICAP service is not available"); @@ -144,7 +144,7 @@ void Adaptation::Icap::ModXact::waitForService() comment = "to be available"; } - debugs(93, 7, HERE << "will wait for the service " << comment << status()); + debugs(93, 7, "will wait for the service " << comment << status()); state.serviceWaiting = true; // after callWhenReady() which may throw state.waitedForService = true; } @@ -197,7 +197,7 @@ void Adaptation::Icap::ModXact::startShoveling() requestBuf.init(); makeRequestHeaders(requestBuf); - debugs(93, 9, HERE << "will write" << status() << ":\n" << + debugs(93, 9, "will write" << status() << ":\n" << (requestBuf.terminate(), requestBuf.content())); // write headers @@ -208,7 +208,7 @@ void Adaptation::Icap::ModXact::startShoveling() void Adaptation::Icap::ModXact::handleCommWrote(size_t sz) { - debugs(93, 5, HERE << "Wrote " << sz << " bytes"); + debugs(93, 5, "Wrote " << sz << " bytes"); if (state.writing == State::writingHeaders) handleCommWroteHeaders(); @@ -238,7 +238,7 @@ void Adaptation::Icap::ModXact::handleCommWroteHeaders() void Adaptation::Icap::ModXact::writeMore() { - debugs(93, 5, HERE << "checking whether to write more" << status()); + debugs(93, 5, "checking whether to write more" << status()); if (writer != NULL) // already writing something return; @@ -274,7 +274,7 @@ void Adaptation::Icap::ModXact::writeMore() void Adaptation::Icap::ModXact::writePreviewBody() { - debugs(93, 8, HERE << "will write Preview body from " << + debugs(93, 8, "will write Preview body from " << virgin.body_pipe << status()); Must(state.writing == State::writingPreview); Must(virgin.body_pipe != NULL); @@ -299,7 +299,7 @@ void Adaptation::Icap::ModXact::decideWritingAfterPreview(const char *kind) else stopWriting(true); // ICAP server reply implies no post-preview writing - debugs(93, 6, HERE << "decided on writing after " << kind << " preview" << + debugs(93, 6, "decided on writing after " << kind << " preview" << status()); } @@ -312,7 +312,7 @@ void Adaptation::Icap::ModXact::writePrimeBody() writeSomeBody("prime virgin body", size); if (virginBodyEndReached(virginBodyWriting)) { - debugs(93, 5, HERE << "wrote entire body"); + debugs(93, 5, "wrote entire body"); stopWriting(true); } } @@ -321,7 +321,7 @@ void Adaptation::Icap::ModXact::writeSomeBody(const char *label, size_t size) { Must(!writer && state.writing < state.writingAlmostDone); Must(virgin.body_pipe != NULL); - debugs(93, 8, HERE << "will write up to " << size << " bytes of " << + debugs(93, 8, "will write up to " << size << " bytes of " << label); MemBuf writeBuf; // TODO: suggest a min size based on size and lastChunk @@ -332,7 +332,7 @@ void Adaptation::Icap::ModXact::writeSomeBody(const char *label, size_t size) const size_t chunkSize = min(writableSize, size); if (chunkSize) { - debugs(93, 7, HERE << "will write " << chunkSize << + debugs(93, 7, "will write " << chunkSize << "-byte chunk of " << label); openChunk(writeBuf, chunkSize, false); @@ -342,7 +342,7 @@ void Adaptation::Icap::ModXact::writeSomeBody(const char *label, size_t size) virginBodyWriting.progress(chunkSize); virginConsume(); } else { - debugs(93, 7, HERE << "has no writable " << label << " content"); + debugs(93, 7, "has no writable " << label << " content"); } const bool wroteEof = virginBodyEndReached(virginBodyWriting); @@ -353,11 +353,11 @@ void Adaptation::Icap::ModXact::writeSomeBody(const char *label, size_t size) } if (lastChunk) { - debugs(93, 8, HERE << "will write last-chunk of " << label); + debugs(93, 8, "will write last-chunk of " << label); addLastRequestChunk(writeBuf); } - debugs(93, 7, HERE << "will write " << writeBuf.contentSize() + debugs(93, 7, "will write " << writeBuf.contentSize() << " raw bytes of " << label); if (writeBuf.hasContent()) { @@ -424,7 +424,7 @@ const char *Adaptation::Icap::ModXact::virginContentData(const Adaptation::Icap: void Adaptation::Icap::ModXact::virginConsume() { - debugs(93, 9, HERE << "consumption guards: " << !virgin.body_pipe << isRetriable << + debugs(93, 9, "consumption guards: " << !virgin.body_pipe << isRetriable << isRepeatable << canStartBypass << protectGroupBypass); if (!virgin.body_pipe) @@ -444,7 +444,7 @@ void Adaptation::Icap::ModXact::virginConsume() // down. Not postponing may increase the number of ICAP errors // if the ICAP service fails. We may also use "potential" space to // postpone more aggressively. Should the trade-off be configurable? - debugs(93, 8, HERE << "postponing consumption from " << bp.status()); + debugs(93, 8, "postponing consumption from " << bp.status()); return; } @@ -452,7 +452,7 @@ void Adaptation::Icap::ModXact::virginConsume() const uint64_t end = virginConsumed + have; uint64_t offset = end; - debugs(93, 9, HERE << "max virgin consumption offset=" << offset << + debugs(93, 9, "max virgin consumption offset=" << offset << " acts " << virginBodyWriting.active() << virginBodySending.active() << " consumed=" << virginConsumed << " from " << virgin.body_pipe->status()); @@ -466,7 +466,7 @@ void Adaptation::Icap::ModXact::virginConsume() Must(virginConsumed <= offset && offset <= end); if (const size_t size = static_cast(offset - virginConsumed)) { - debugs(93, 8, HERE << "consuming " << size << " out of " << have << + debugs(93, 8, "consuming " << size << " out of " << have << " virgin body bytes"); bp.consume(size); virginConsumed += size; @@ -491,12 +491,12 @@ void Adaptation::Icap::ModXact::stopWriting(bool nicely) if (writer != NULL) { if (nicely) { - debugs(93, 7, HERE << "will wait for the last write" << status()); + debugs(93, 7, "will wait for the last write" << status()); state.writing = State::writingAlmostDone; // may already be set checkConsuming(); return; } - debugs(93, 3, HERE << "will NOT wait for the last write" << status()); + debugs(93, 3, "will NOT wait for the last write" << status()); // Comm does not have an interface to clear the writer callback nicely, // but without clearing the writer we cannot recycle the connection. @@ -507,7 +507,7 @@ void Adaptation::Icap::ModXact::stopWriting(bool nicely) ignoreLastWrite = true; } - debugs(93, 7, HERE << "will no longer write" << status()); + debugs(93, 7, "will no longer write" << status()); if (virginBodyWriting.active()) { virginBodyWriting.disable(); virginConsume(); @@ -521,7 +521,7 @@ void Adaptation::Icap::ModXact::stopBackup() if (!virginBodySending.active()) return; - debugs(93, 7, HERE << "will no longer backup" << status()); + debugs(93, 7, "will no longer backup" << status()); virginBodySending.disable(); virginConsume(); } @@ -547,21 +547,21 @@ void Adaptation::Icap::ModXact::startReading() void Adaptation::Icap::ModXact::readMore() { if (reader != NULL || doneReading()) { - debugs(93,3,HERE << "returning from readMore because reader or doneReading()"); + debugs(93,3, "returning from readMore because reader or doneReading()"); return; } // do not fill readBuf if we have no space to store the result if (adapted.body_pipe != NULL && !adapted.body_pipe->buf().hasPotentialSpace()) { - debugs(93,3,HERE << "not reading because ICAP reply pipe is full"); + debugs(93,3, "not reading because ICAP reply pipe is full"); return; } if (readBuf.length() < SQUID_TCP_SO_RCVBUF) scheduleRead(); else - debugs(93,3,HERE << "cannot read with a full buffer"); + debugs(93,3, "cannot read with a full buffer"); } // comm module read a portion of the ICAP response for us @@ -580,14 +580,14 @@ void Adaptation::Icap::ModXact::echoMore() Must(virginBodySending.active()); const size_t sizeMax = virginContentSize(virginBodySending); - debugs(93,5, HERE << "will echo up to " << sizeMax << " bytes from " << + debugs(93,5, "will echo up to " << sizeMax << " bytes from " << virgin.body_pipe->status()); - debugs(93,5, HERE << "will echo up to " << sizeMax << " bytes to " << + debugs(93,5, "will echo up to " << sizeMax << " bytes to " << adapted.body_pipe->status()); if (sizeMax > 0) { const size_t size = adapted.body_pipe->putMoreData(virginContentData(virginBodySending), sizeMax); - debugs(93,5, HERE << "echoed " << size << " out of " << sizeMax << + debugs(93,5, "echoed " << size << " out of " << sizeMax << " bytes"); virginBodySending.progress(size); disableRepeats("echoed content"); @@ -596,10 +596,10 @@ void Adaptation::Icap::ModXact::echoMore() } if (virginBodyEndReached(virginBodySending)) { - debugs(93, 5, HERE << "echoed all" << status()); + debugs(93, 5, "echoed all" << status()); stopSending(true); } else { - debugs(93, 5, HERE << "has " << + debugs(93, 5, "has " << virgin.body_pipe->buf().contentSize() << " bytes " << "and expects more to echo" << status()); // TODO: timeout if virgin or adapted pipes are broken @@ -614,13 +614,13 @@ bool Adaptation::Icap::ModXact::doneSending() const // stop (or do not start) sending adapted message body void Adaptation::Icap::ModXact::stopSending(bool nicely) { - debugs(93, 7, HERE << "Enter stop sending "); + debugs(93, 7, "Enter stop sending "); if (doneSending()) return; - debugs(93, 7, HERE << "Proceed with stop sending "); + debugs(93, 7, "Proceed with stop sending "); if (state.sending != State::sendingUndecided) { - debugs(93, 7, HERE << "will no longer send" << status()); + debugs(93, 7, "will no longer send" << status()); if (adapted.body_pipe != NULL) { virginBodySending.disable(); // we may leave debts if we were echoing and the virgin @@ -629,7 +629,7 @@ void Adaptation::Icap::ModXact::stopSending(bool nicely) stopProducingFor(adapted.body_pipe, nicely && !leftDebts); } } else { - debugs(93, 7, HERE << "will not start sending" << status()); + debugs(93, 7, "will not start sending" << status()); Must(!adapted.body_pipe); } @@ -644,7 +644,7 @@ void Adaptation::Icap::ModXact::checkConsuming() if (!virgin.body_pipe || !state.doneConsumingVirgin()) return; - debugs(93, 7, HERE << "will stop consuming" << status()); + debugs(93, 7, "will stop consuming" << status()); stopConsumingFrom(virgin.body_pipe); } @@ -677,7 +677,7 @@ void Adaptation::Icap::ModXact::callException(const std::exception &e) } try { - debugs(93, 3, HERE << "bypassing " << inCall << " exception: " << + debugs(93, 3, "bypassing " << inCall << " exception: " << e.what() << ' ' << status()); bypassFailure(); } catch (const TextException &bypassTe) { @@ -709,7 +709,7 @@ void Adaptation::Icap::ModXact::bypassFailure() reuseConnection = false; // be conservative cancelRead(); // may not work; and we cannot stop connecting either if (!doneWithIo()) - debugs(93, 7, HERE << "Warning: bypass failed to stop I/O" << status()); + debugs(93, 7, "Warning: bypass failed to stop I/O" << status()); } service().noteFailure(); // we are bypassing, but this is still a failure @@ -718,11 +718,11 @@ void Adaptation::Icap::ModXact::bypassFailure() void Adaptation::Icap::ModXact::disableBypass(const char *reason, bool includingGroupBypass) { if (canStartBypass) { - debugs(93,7, HERE << "will never start bypass because " << reason); + debugs(93,7, "will never start bypass because " << reason); canStartBypass = false; } if (protectGroupBypass && includingGroupBypass) { - debugs(93,7, HERE << "not protecting group bypass because " << reason); + debugs(93,7, "not protecting group bypass because " << reason); protectGroupBypass = false; } } @@ -749,12 +749,12 @@ void Adaptation::Icap::ModXact::parseHeaders() Must(state.parsingHeaders()); if (state.parsing == State::psIcapHeader) { - debugs(93, 5, HERE << "parse ICAP headers"); + debugs(93, 5, "parse ICAP headers"); parseIcapHead(); } if (state.parsing == State::psHttpHeader) { - debugs(93, 5, HERE << "parse HTTP headers"); + debugs(93, 5, "parse HTTP headers"); parseHttpHead(); } @@ -801,7 +801,7 @@ void Adaptation::Icap::ModXact::parseIcapHead() static SBuf close("close", 5); if (httpHeaderHasConnDir(&icapReply->header, close)) { - debugs(93, 5, HERE << "found connection close"); + debugs(93, 5, "found connection close"); reuseConnection = false; } @@ -932,11 +932,11 @@ void Adaptation::Icap::ModXact::handle206PartialContent() if (state.writing == State::writingPaused) { Must(preview.enabled()); Must(state.allowedPreview206); - debugs(93, 7, HERE << "206 inside preview"); + debugs(93, 7, "206 inside preview"); } else { Must(state.writing > State::writingPaused); Must(state.allowedPostview206); - debugs(93, 7, HERE << "206 outside preview"); + debugs(93, 7, "206 outside preview"); } state.parsing = State::psHttpHeader; state.sending = State::sendingAdapted; @@ -960,7 +960,7 @@ void Adaptation::Icap::ModXact::prepEchoing() // TODO: use Http::Message::clone()! Http::Message *oldHead = virgin.header; - debugs(93, 7, HERE << "cloning virgin message " << oldHead); + debugs(93, 7, "cloning virgin message " << oldHead); MemBuf httpBuf; @@ -993,12 +993,12 @@ void Adaptation::Icap::ModXact::prepEchoing() httpBuf.clean(); - debugs(93, 7, HERE << "cloned virgin message " << oldHead << " to " << + debugs(93, 7, "cloned virgin message " << oldHead << " to " << adapted.header); // setup adapted body pipe if needed if (oldHead->body_pipe != NULL) { - debugs(93, 7, HERE << "will echo virgin body from " << + debugs(93, 7, "will echo virgin body from " << oldHead->body_pipe); if (!virginBodySending.active()) virginBodySending.plan(); // will throw if not possible @@ -1010,10 +1010,10 @@ void Adaptation::Icap::ModXact::prepEchoing() makeAdaptedBodyPipe("echoed virgin response"); if (oldHead->body_pipe->bodySizeKnown()) adapted.body_pipe->setBodySize(oldHead->body_pipe->bodySize()); - debugs(93, 7, HERE << "will echo virgin body to " << + debugs(93, 7, "will echo virgin body to " << adapted.body_pipe); } else { - debugs(93, 7, HERE << "no virgin body to echo"); + debugs(93, 7, "no virgin body to echo"); stopSending(true); } } @@ -1027,7 +1027,7 @@ void Adaptation::Icap::ModXact::prepPartialBodyEchoing(uint64_t pos) setOutcome(xoPartEcho); - debugs(93, 7, HERE << "will echo virgin body suffix from " << + debugs(93, 7, "will echo virgin body suffix from " << virgin.header->body_pipe << " offset " << pos ); // check that use-original-body=N does not point beyond buffered data @@ -1042,7 +1042,7 @@ void Adaptation::Icap::ModXact::prepPartialBodyEchoing(uint64_t pos) if (virgin.header->body_pipe->bodySizeKnown()) adapted.body_pipe->expectProductionEndAfter(virgin.header->body_pipe->bodySize() - pos); - debugs(93, 7, HERE << "will echo virgin body suffix to " << + debugs(93, 7, "will echo virgin body suffix to " << adapted.body_pipe); // Start echoing data @@ -1142,7 +1142,7 @@ bool Adaptation::Icap::ModXact::expectIcapTrailers() const void Adaptation::Icap::ModXact::decideOnParsingBody() { if (expectHttpBody()) { - debugs(93, 5, HERE << "expecting a body"); + debugs(93, 5, "expecting a body"); state.parsing = State::psBody; replyHttpBodySize = 0; bodyParser = new Http1::TeChunkedParser; @@ -1150,7 +1150,7 @@ void Adaptation::Icap::ModXact::decideOnParsingBody() makeAdaptedBodyPipe("adapted response from the ICAP server"); Must(state.sending == State::sendingAdapted); } else { - debugs(93, 5, HERE << "not expecting a body"); + debugs(93, 5, "not expecting a body"); if (trailerParser) state.parsing = State::psIcapTrailer; else @@ -1195,10 +1195,10 @@ void Adaptation::Icap::ModXact::parseBody() return; } - debugs(93,3,HERE << this << " needsMoreData = " << bodyParser->needsMoreData()); + debugs(93,3, this << " needsMoreData = " << bodyParser->needsMoreData()); if (bodyParser->needsMoreData()) { - debugs(93,3,HERE << this); + debugs(93,3, this); Must(mayReadMore()); readMore(); } @@ -1293,7 +1293,7 @@ Adaptation::Icap::ModXact::~ModXact() // internal cleanup void Adaptation::Icap::ModXact::swanSong() { - debugs(93, 5, HERE << "swan sings" << status()); + debugs(93, 5, "swan sings" << status()); stopWriting(false); stopSending(false); @@ -1638,7 +1638,7 @@ Adaptation::Icap::ModXact::packHead(MemBuf &httpBuf, const Http::Message *head) void Adaptation::Icap::ModXact::decideOnPreview() { if (!TheConfig.preview_enable) { - debugs(93, 5, HERE << "preview disabled by squid.conf"); + debugs(93, 5, "preview disabled by squid.conf"); return; } @@ -1659,7 +1659,7 @@ void Adaptation::Icap::ModXact::decideOnPreview() else if (virginBody.knownSize()) ad = min(static_cast(ad), virginBody.size()); // not more than we have - debugs(93, 5, HERE << "should offer " << ad << "-byte preview " << + debugs(93, 5, "should offer " << ad << "-byte preview " << "(service wanted " << wantedSize << ")"); preview.enable(ad); @@ -1840,7 +1840,7 @@ void Adaptation::Icap::ModXact::estimateVirginBody() // expectingBody returns true for zero-sized bodies, but we will not // get a pipe for that body, so we treat the message as bodyless if (method != Http::METHOD_NONE && msg->expectingBody(method, size) && size) { - debugs(93, 6, HERE << "expects virgin body from " << + debugs(93, 6, "expects virgin body from " << virgin.body_pipe << "; size: " << size); virginBody.expect(size); @@ -1854,7 +1854,7 @@ void Adaptation::Icap::ModXact::estimateVirginBody() // make sure TheBackupLimit is in-sync with the buffer size Must(TheBackupLimit <= static_cast(msg->body_pipe->buf().max_capacity)); } else { - debugs(93, 6, HERE << "does not expect virgin body"); + debugs(93, 6, "does not expect virgin body"); Must(msg->body_pipe == NULL); checkConsuming(); } @@ -1866,7 +1866,7 @@ void Adaptation::Icap::ModXact::makeAdaptedBodyPipe(const char *what) Must(!adapted.header->body_pipe); adapted.header->body_pipe = new BodyPipe(this); adapted.body_pipe = adapted.header->body_pipe; - debugs(93, 7, HERE << "will supply " << what << " via " << + debugs(93, 7, "will supply " << what << " via " << adapted.body_pipe << " pipe"); } @@ -2044,7 +2044,7 @@ Adaptation::Icap::Xaction *Adaptation::Icap::ModXactLauncher::createXaction() void Adaptation::Icap::ModXactLauncher::swanSong() { - debugs(93, 5, HERE << "swan sings"); + debugs(93, 5, "swan sings"); updateHistory(false); Adaptation::Icap::Launcher::swanSong(); } diff --git a/src/adaptation/icap/ModXact.h b/src/adaptation/icap/ModXact.h index a976fb3bdf..2fda1318b8 100644 --- a/src/adaptation/icap/ModXact.h +++ b/src/adaptation/icap/ModXact.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/OptXact.cc b/src/adaptation/icap/OptXact.cc index f8d0aee752..0e36bfce58 100644 --- a/src/adaptation/icap/OptXact.cc +++ b/src/adaptation/icap/OptXact.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -44,7 +44,7 @@ void Adaptation::Icap::OptXact::startShoveling() MemBuf requestBuf; requestBuf.init(); makeRequest(requestBuf); - debugs(93, 9, HERE << "request " << status() << ":\n" << + debugs(93, 9, "request " << status() << ":\n" << (requestBuf.terminate(), requestBuf.content())); icap_tio_start = current_time; scheduleWrite(requestBuf); @@ -75,7 +75,7 @@ void Adaptation::Icap::OptXact::makeRequest(MemBuf &buf) void Adaptation::Icap::OptXact::handleCommWrote(size_t size) { - debugs(93, 9, HERE << "finished writing " << size << + debugs(93, 9, "finished writing " << size << "-byte request " << status()); } @@ -89,7 +89,7 @@ void Adaptation::Icap::OptXact::handleCommRead(size_t) // we leave readAll false which forces connection closure. readAll = icapReply->header.getByNameListMember("Encapsulated", "opt-body", ',').isEmpty(); - debugs(93, 7, HERE << "readAll=" << readAll); + debugs(93, 7, "readAll=" << readAll); icap_tio_finish = current_time; setOutcome(xoOpt); sendAnswer(Answer::Forward(icapReply.getRaw())); diff --git a/src/adaptation/icap/OptXact.h b/src/adaptation/icap/OptXact.h index 3e033637d9..725cd6225e 100644 --- a/src/adaptation/icap/OptXact.h +++ b/src/adaptation/icap/OptXact.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/Options.cc b/src/adaptation/icap/Options.cc index 5519ccb467..0bbbc6c227 100644 --- a/src/adaptation/icap/Options.cc +++ b/src/adaptation/icap/Options.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -151,7 +151,7 @@ void Adaptation::Icap::Options::cfgIntHeader(const HttpHeader *h, const char *fn else value = -1; - debugs(93,5, HERE << "int header: " << fname << ": " << value); + debugs(93,5, "int header: " << fname << ": " << value); } void Adaptation::Icap::Options::cfgTransferList(const HttpHeader *h, TransferList &list) @@ -162,7 +162,7 @@ void Adaptation::Icap::Options::cfgTransferList(const HttpHeader *h, TransferLis if (foundStar) { theTransfers.byDefault = &list; - debugs(93,5, HERE << "set default transfer to " << list.name); + debugs(93,5, "set default transfer to " << list.name); } list.report(5, "Adaptation::Icap::Options::cfgTransferList: "); diff --git a/src/adaptation/icap/Options.h b/src/adaptation/icap/Options.h index 8509dedce5..f3c44c60b1 100644 --- a/src/adaptation/icap/Options.h +++ b/src/adaptation/icap/Options.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index 612366e576..967e6cd768 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -95,7 +95,7 @@ Adaptation::Icap::ServiceRep::finalize() void Adaptation::Icap::ServiceRep::noteFailure() { const int failures = theSessionFailures.count(1); - debugs(93,4, HERE << " failure " << failures << " out of " << + debugs(93,4, " failure " << failures << " out of " << TheConfig.service_failure_limit << " allowed in " << TheConfig.oldest_service_failure << "sec " << status()); @@ -139,7 +139,7 @@ Adaptation::Icap::ServiceRep::getIdleConnection(const bool retriableXact) theIdleConns->closeN(1); ++theBusyConns; - debugs(93,3, HERE << "got connection: " << connection); + debugs(93,3, "got connection: " << connection); return connection; } @@ -149,10 +149,10 @@ void Adaptation::Icap::ServiceRep::putConnection(const Comm::ConnectionPointer & Must(Comm::IsConnOpen(conn)); // do not pool an idle connection if we owe connections if (isReusable && excessConnections() == 0) { - debugs(93, 3, HERE << "pushing pconn" << comment); + debugs(93, 3, "pushing pconn" << comment); theIdleConns->push(conn); } else { - debugs(93, 3, HERE << (sendReset ? "RST" : "FIN") << "-closing " << + debugs(93, 3, (sendReset ? "RST" : "FIN") << "-closing " << comment); // comm_close called from Connection::close will clear timeout // TODO: add "bool sendReset = false" to Connection::close()? @@ -177,7 +177,7 @@ void Adaptation::Icap::ServiceRep::noteConnectionUse(const Comm::ConnectionPoint void Adaptation::Icap::ServiceRep::noteConnectionFailed(const char *comment) { - debugs(93, 3, HERE << "Connection failed: " << comment); + debugs(93, 3, "Connection failed: " << comment); --theBusyConns; } @@ -263,7 +263,7 @@ void Adaptation::Icap::ServiceRep::busyCheckpoint() freed = available - notifiedWaiters; } - debugs(93,7, HERE << "Available connections: " << available << + debugs(93,7, "Available connections: " << available << " freed slots: " << freed << " waiting in queue: " << theNotificationWaiters.size()); @@ -279,7 +279,7 @@ void Adaptation::Icap::ServiceRep::busyCheckpoint() void Adaptation::Icap::ServiceRep::suspend(const char *reason) { if (isSuspended) { - debugs(93,4, HERE << "keeping suspended, also for " << reason); + debugs(93,4, "keeping suspended, also for " << reason); } else { isSuspended = reason; debugs(93, DBG_IMPORTANT, "suspending ICAP service for " << reason); @@ -370,11 +370,11 @@ void Adaptation::Icap::ServiceRep::noteTimeToUpdate() updateScheduled = false; if (detached() || theOptionsFetcher.set()) { - debugs(93,5, HERE << "ignores options update " << status()); + debugs(93,5, "ignores options update " << status()); return; } - debugs(93,5, HERE << "performs a regular options update " << status()); + debugs(93,5, "performs a regular options update " << status()); startGettingOptions(); } @@ -382,7 +382,7 @@ void Adaptation::Icap::ServiceRep::noteTimeToNotify() { Must(!notifying); notifying = true; - debugs(93,7, HERE << "notifies " << theClients.size() << " clients " << + debugs(93,7, "notifies " << theClients.size() << " clients " << status()); // note: we must notify even if we are invalidated @@ -421,7 +421,7 @@ void Adaptation::Icap::ServiceRep::callWhenReady(AsyncCall::Pointer &cb) { Must(cb!=NULL); - debugs(93,5, HERE << "Adaptation::Icap::Service is asked to call " << *cb << + debugs(93,5, "Adaptation::Icap::Service is asked to call " << *cb << " when ready " << status()); Must(!broken()); // we do not wait for a broken service @@ -442,7 +442,7 @@ void Adaptation::Icap::ServiceRep::callWhenReady(AsyncCall::Pointer &cb) void Adaptation::Icap::ServiceRep::scheduleNotification() { - debugs(93,7, HERE << "will notify " << theClients.size() << " clients"); + debugs(93,7, "will notify " << theClients.size() << " clients"); CallJobHere(93, 5, this, Adaptation::Icap::ServiceRep, noteTimeToNotify); } @@ -453,7 +453,7 @@ bool Adaptation::Icap::ServiceRep::needNewOptions() const void Adaptation::Icap::ServiceRep::changeOptions(Adaptation::Icap::Options *newOptions) { - debugs(93,8, HERE << "changes options from " << theOptions << " to " << + debugs(93,8, "changes options from " << theOptions << " to " << newOptions << ' ' << status()); delete theOptions; @@ -540,7 +540,7 @@ void Adaptation::Icap::ServiceRep::noteAdaptationAnswer(const Answer &answer) clearAdaptation(theOptionsFetcher); if (answer.kind == Answer::akError) { - debugs(93,3, HERE << "failed to fetch options " << status()); + debugs(93,3, "failed to fetch options " << status()); handleNewOptions(0); return; } @@ -549,7 +549,7 @@ void Adaptation::Icap::ServiceRep::noteAdaptationAnswer(const Answer &answer) const Http::Message *msg = answer.message.getRaw(); Must(msg); - debugs(93,5, HERE << "is interpreting new options " << status()); + debugs(93,5, "is interpreting new options " << status()); Adaptation::Icap::Options *newOptions = NULL; if (const HttpReply *r = dynamic_cast(msg)) { @@ -577,7 +577,7 @@ void Adaptation::Icap::ServiceRep::handleNewOptions(Adaptation::Icap::Options *n // new options may be NULL changeOptions(newOptions); - debugs(93,3, HERE << "got new options and is now " << status()); + debugs(93,3, "got new options and is now " << status()); scheduleUpdate(optionsFetchTime()); @@ -587,7 +587,7 @@ void Adaptation::Icap::ServiceRep::handleNewOptions(Adaptation::Icap::Options *n // if we owe connections and have idle pconns, close the latter if (excess && theIdleConns->count() > 0) { const int n = min(excess, theIdleConns->count()); - debugs(93,5, HERE << "closing " << n << " pconns to relief debt"); + debugs(93,5, "closing " << n << " pconns to relief debt"); theIdleConns->closeN(n); } @@ -597,7 +597,7 @@ void Adaptation::Icap::ServiceRep::handleNewOptions(Adaptation::Icap::Options *n void Adaptation::Icap::ServiceRep::startGettingOptions() { Must(!theOptionsFetcher); - debugs(93,6, HERE << "will get new options " << status()); + debugs(93,6, "will get new options " << status()); // XXX: "this" here is "self"; works until refcounting API changes theOptionsFetcher = initiateAdaptation( @@ -609,7 +609,7 @@ void Adaptation::Icap::ServiceRep::startGettingOptions() void Adaptation::Icap::ServiceRep::scheduleUpdate(time_t when) { if (updateScheduled) { - debugs(93,7, HERE << "reschedules update"); + debugs(93,7, "reschedules update"); // XXX: check whether the event is there because AR saw // an unreproducible eventDelete assertion on 2007/06/18 if (eventFind(&ServiceRep_noteTimeToUpdate, this)) @@ -619,9 +619,9 @@ void Adaptation::Icap::ServiceRep::scheduleUpdate(time_t when) updateScheduled = false; } - debugs(93,7, HERE << "raw OPTIONS fetch at " << when << " or in " << + debugs(93,7, "raw OPTIONS fetch at " << when << " or in " << (when - squid_curtime) << " sec"); - debugs(93,9, HERE << "last fetched at " << theLastUpdate << " or " << + debugs(93,9, "last fetched at " << theLastUpdate << " or " << (squid_curtime - theLastUpdate) << " sec ago"); /* adjust update time to prevent too-frequent updates */ @@ -635,7 +635,7 @@ void Adaptation::Icap::ServiceRep::scheduleUpdate(time_t when) when = theLastUpdate + minUpdateGap; const int delay = when - squid_curtime; - debugs(93,5, HERE << "will fetch OPTIONS in " << delay << " sec"); + debugs(93,5, "will fetch OPTIONS in " << delay << " sec"); eventAdd("Adaptation::Icap::ServiceRep::noteTimeToUpdate", &ServiceRep_noteTimeToUpdate, this, delay, 0, true); @@ -648,7 +648,7 @@ Adaptation::Icap::ServiceRep::optionsFetchTime() const { if (theOptions && theOptions->valid()) { const time_t expire = theOptions->expire(); - debugs(93,7, HERE << "options expire on " << expire << " >= " << squid_curtime); + debugs(93,7, "options expire on " << expire << " >= " << squid_curtime); // conservative estimate of how long the OPTIONS transaction will take // XXX: move hard-coded constants from here to Adaptation::Icap::TheConfig @@ -717,7 +717,7 @@ const char *Adaptation::Icap::ServiceRep::status() const void Adaptation::Icap::ServiceRep::detach() { - debugs(93,3, HERE << "detaching ICAP service: " << cfg().uri << + debugs(93,3, "detaching ICAP service: " << cfg().uri << ' ' << status()); isDetached = true; } diff --git a/src/adaptation/icap/ServiceRep.h b/src/adaptation/icap/ServiceRep.h index d7cd604d69..cca2df4ab0 100644 --- a/src/adaptation/icap/ServiceRep.h +++ b/src/adaptation/icap/ServiceRep.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc index e98cc5e60b..a91d0c56ea 100644 --- a/src/adaptation/icap/Xaction.cc +++ b/src/adaptation/icap/Xaction.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -226,7 +226,7 @@ void Adaptation::Icap::Xaction::closeConnection() if (reuseConnection && !doneWithIo()) { //status() adds leading spaces. - debugs(93,5, HERE << "not reusing pconn due to pending I/O" << status()); + debugs(93,5, "not reusing pconn due to pending I/O" << status()); reuseConnection = false; } @@ -304,7 +304,7 @@ Adaptation::Icap::Xaction::useIcapConnection(const Comm::ConnectionPointer &conn void Adaptation::Icap::Xaction::dieOnConnectionFailure() { - debugs(93, 2, HERE << typeName << + debugs(93, 2, typeName << " failed to connect to " << service().cfg().uri); service().noteConnectionFailed("failure"); static const auto d = MakeNamedErrorDetail("ICAP_XACT_START"); @@ -333,7 +333,7 @@ void Adaptation::Icap::Xaction::noteCommWrote(const CommIoCbParams &io) if (ignoreLastWrite) { // a hack due to comm inability to cancel a pending write ignoreLastWrite = false; - debugs(93, 7, HERE << "ignoring last write; status: " << io.flag); + debugs(93, 7, "ignoring last write; status: " << io.flag); } else { Must(io.flag == Comm::OK); al.icap.bytesSent += io.size; @@ -345,7 +345,7 @@ void Adaptation::Icap::Xaction::noteCommWrote(const CommIoCbParams &io) // communication timeout with the ICAP service void Adaptation::Icap::Xaction::noteCommTimedout(const CommTimeoutCbParams &) { - debugs(93, 2, HERE << typeName << " failed: timeout with " << + debugs(93, 2, typeName << " failed: timeout with " << theService->cfg().methodStr() << " " << theService->cfg().uri << status()); reuseConnection = false; @@ -378,7 +378,7 @@ void Adaptation::Icap::Xaction::callException(const std::exception &e) void Adaptation::Icap::Xaction::callEnd() { if (doneWithIo()) { - debugs(93, 5, HERE << typeName << " done with I/O" << status()); + debugs(93, 5, typeName << " done with I/O" << status()); closeConnection(); } Adaptation::Initiate::callEnd(); // may destroy us @@ -545,7 +545,7 @@ void Adaptation::Icap::Xaction::noteInitiatorAborted() { if (theInitiator.set()) { - debugs(93,4, HERE << "Initiator gone before ICAP transaction ended"); + debugs(93,4, "Initiator gone before ICAP transaction ended"); clearInitiator(); static const auto d = MakeNamedErrorDetail("ICAP_INIT_GONE"); detailError(d); @@ -560,7 +560,7 @@ void Adaptation::Icap::Xaction::setOutcome(const Adaptation::Icap::XactOutcome & if (al.icap.outcome != xoUnknown) { debugs(93, 3, "WARNING: resetting outcome: from " << al.icap.outcome << " to " << xo); } else { - debugs(93, 4, HERE << xo); + debugs(93, 4, xo); } al.icap.outcome = xo; } diff --git a/src/adaptation/icap/Xaction.h b/src/adaptation/icap/Xaction.h index 9c2742149a..31a6e22fc9 100644 --- a/src/adaptation/icap/Xaction.h +++ b/src/adaptation/icap/Xaction.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc index 6bb5a6d620..1fddc371b5 100644 --- a/src/adaptation/icap/icap_log.cc +++ b/src/adaptation/icap/icap_log.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/icap/icap_log.h b/src/adaptation/icap/icap_log.h index ef777cb902..b5f20e29c0 100644 --- a/src/adaptation/icap/icap_log.h +++ b/src/adaptation/icap/icap_log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/adaptation/notes.dox b/src/adaptation/notes.dox index 02894dbf0c..12b9c40cde 100644 --- a/src/adaptation/notes.dox +++ b/src/adaptation/notes.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/Makefile.am b/src/anyp/Makefile.am index 0c77b74a05..f65f192934 100644 --- a/src/anyp/Makefile.am +++ b/src/anyp/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/anyp/PortCfg.cc b/src/anyp/PortCfg.cc index 6a86396b5c..5aa0100068 100644 --- a/src/anyp/PortCfg.cc +++ b/src/anyp/PortCfg.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/PortCfg.h b/src/anyp/PortCfg.h index 5cffac33a5..93bfbaf1d6 100644 --- a/src/anyp/PortCfg.h +++ b/src/anyp/PortCfg.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/ProtocolType.h b/src/anyp/ProtocolType.h index 66f7bc2d9f..e736c19a39 100644 --- a/src/anyp/ProtocolType.h +++ b/src/anyp/ProtocolType.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/ProtocolVersion.h b/src/anyp/ProtocolVersion.h index ad1bd44ded..9fd04a58c7 100644 --- a/src/anyp/ProtocolVersion.h +++ b/src/anyp/ProtocolVersion.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/TrafficMode.h b/src/anyp/TrafficMode.h index a18ed955e3..ca7ab719ae 100644 --- a/src/anyp/TrafficMode.h +++ b/src/anyp/TrafficMode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/Uri.cc b/src/anyp/Uri.cc index 7fa98a455f..aa6b9011e1 100644 --- a/src/anyp/Uri.cc +++ b/src/anyp/Uri.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/Uri.h b/src/anyp/Uri.h index bb29734d8b..df83b8bc64 100644 --- a/src/anyp/Uri.h +++ b/src/anyp/Uri.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/UriScheme.cc b/src/anyp/UriScheme.cc index 180d3fb613..ef8c71cc28 100644 --- a/src/anyp/UriScheme.cc +++ b/src/anyp/UriScheme.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/UriScheme.h b/src/anyp/UriScheme.h index 35779c4c54..ef82ede57d 100644 --- a/src/anyp/UriScheme.h +++ b/src/anyp/UriScheme.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/anyp/forward.h b/src/anyp/forward.h index ef392edfd3..c0d5006fc8 100644 --- a/src/anyp/forward.h +++ b/src/anyp/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/Acl.cc b/src/auth/Acl.cc index c744acffbb..2df1d3f304 100644 --- a/src/auth/Acl.cc +++ b/src/auth/Acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -60,7 +60,7 @@ AuthenticateAcl(ACLChecklist *ch) switch (result) { case AUTH_ACL_CANNOT_AUTHENTICATE: - debugs(28, 4, HERE << "returning " << ACCESS_DENIED << " user authenticated but not authorised."); + debugs(28, 4, "returning " << ACCESS_DENIED << " user authenticated but not authorised."); return ACCESS_DENIED; case AUTH_AUTHENTICATED: @@ -75,7 +75,7 @@ AuthenticateAcl(ACLChecklist *ch) return ACCESS_DUNNO; // XXX: break this down into DUNNO, EXPIRED_OK, EXPIRED_BAD states case AUTH_ACL_CHALLENGE: - debugs(28, 4, HERE << "returning " << ACCESS_AUTH_REQUIRED << " sending authentication challenge."); + debugs(28, 4, "returning " << ACCESS_AUTH_REQUIRED << " sending authentication challenge."); /* Client is required to resend the request with correct authentication * credentials. (This may be part of a stateful auth protocol.) * The request is denied. diff --git a/src/auth/Acl.h b/src/auth/Acl.h index 2d5eda8ee1..5e4d3d6f4d 100644 --- a/src/auth/Acl.h +++ b/src/auth/Acl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc index 0f73ebe19d..f2fab8f786 100644 --- a/src/auth/AclMaxUserIp.cc +++ b/src/auth/AclMaxUserIp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/AclMaxUserIp.h b/src/auth/AclMaxUserIp.h index a999767b74..9669fa5a1f 100644 --- a/src/auth/AclMaxUserIp.h +++ b/src/auth/AclMaxUserIp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/AclProxyAuth.cc b/src/auth/AclProxyAuth.cc index 797a07c080..ce9d4cbd50 100644 --- a/src/auth/AclProxyAuth.cc +++ b/src/auth/AclProxyAuth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -115,7 +115,7 @@ ProxyAuthLookup::checkForAsync(ACLChecklist *cl) const { ACLFilledChecklist *checklist = Filled(cl); - debugs(28, 3, HERE << "checking password via authenticator"); + debugs(28, 3, "checking password via authenticator"); /* make sure someone created auth_user_request for us */ assert(checklist->auth_user_request != NULL); diff --git a/src/auth/AclProxyAuth.h b/src/auth/AclProxyAuth.h index ea68538087..1247230e1e 100644 --- a/src/auth/AclProxyAuth.h +++ b/src/auth/AclProxyAuth.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/AuthAclState.h b/src/auth/AuthAclState.h index 23292088c8..f65f1c9747 100644 --- a/src/auth/AuthAclState.h +++ b/src/auth/AuthAclState.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/Config.cc b/src/auth/Config.cc index 39ecc2ee77..64b74db450 100644 --- a/src/auth/Config.cc +++ b/src/auth/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/Config.h b/src/auth/Config.h index 748e79bae4..3d29da748e 100644 --- a/src/auth/Config.h +++ b/src/auth/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/CredentialState.h b/src/auth/CredentialState.h index b0c0189b37..fecb072122 100644 --- a/src/auth/CredentialState.h +++ b/src/auth/CredentialState.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/CredentialsCache.cc b/src/auth/CredentialsCache.cc index e2a3838fc9..97efa09c52 100644 --- a/src/auth/CredentialsCache.cc +++ b/src/auth/CredentialsCache.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/CredentialsCache.h b/src/auth/CredentialsCache.h index 3c44849c14..0169347a4b 100644 --- a/src/auth/CredentialsCache.h +++ b/src/auth/CredentialsCache.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc index b0223c39d6..15c49a8c8d 100644 --- a/src/auth/Gadgets.cc +++ b/src/auth/Gadgets.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -44,7 +44,7 @@ authenticateActiveSchemeCount(void) ++rv; } - debugs(29, 9, HERE << rv << " active."); + debugs(29, 9, rv << " active."); return rv; } @@ -54,7 +54,7 @@ authenticateSchemeCount(void) { int rv = Auth::Scheme::GetSchemes().size(); - debugs(29, 9, HERE << rv << " active."); + debugs(29, 9, rv << " active."); return rv; } diff --git a/src/auth/Gadgets.h b/src/auth/Gadgets.h index 99c05baf39..5a80d6c88e 100644 --- a/src/auth/Gadgets.h +++ b/src/auth/Gadgets.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am index fb69f25918..f5736aebcb 100644 --- a/src/auth/Makefile.am +++ b/src/auth/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/QueueNode.h b/src/auth/QueueNode.h index d3f61da523..4905128068 100644 --- a/src/auth/QueueNode.h +++ b/src/auth/QueueNode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc index a887608811..3001805bdd 100644 --- a/src/auth/Scheme.cc +++ b/src/auth/Scheme.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/Scheme.h b/src/auth/Scheme.h index 1a88103239..7642ca58ea 100644 --- a/src/auth/Scheme.h +++ b/src/auth/Scheme.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/SchemeConfig.cc b/src/auth/SchemeConfig.cc index 6a6216a948..6f1924fc39 100644 --- a/src/auth/SchemeConfig.cc +++ b/src/auth/SchemeConfig.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -33,7 +33,7 @@ Auth::UserRequest::Pointer Auth::SchemeConfig::CreateAuthUser(const char *proxy_auth, AccessLogEntry::Pointer &al) { assert(proxy_auth != NULL); - debugs(29, 9, HERE << "header = '" << proxy_auth << "'"); + debugs(29, 9, "header = '" << proxy_auth << "'"); Auth::SchemeConfig *config = Find(proxy_auth); diff --git a/src/auth/SchemeConfig.h b/src/auth/SchemeConfig.h index 12a3dcbd3f..1728792e3e 100644 --- a/src/auth/SchemeConfig.h +++ b/src/auth/SchemeConfig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/SchemesConfig.cc b/src/auth/SchemesConfig.cc index 22b3ac76e2..0ef52c45f7 100644 --- a/src/auth/SchemesConfig.cc +++ b/src/auth/SchemesConfig.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/SchemesConfig.h b/src/auth/SchemesConfig.h index fca232d1e3..1f77c3dd6d 100644 --- a/src/auth/SchemesConfig.h +++ b/src/auth/SchemesConfig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/State.cc b/src/auth/State.cc index ca14700cb0..c862c9c32f 100644 --- a/src/auth/State.cc +++ b/src/auth/State.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/State.h b/src/auth/State.h index 98571a2a8f..307c36d8dd 100644 --- a/src/auth/State.h +++ b/src/auth/State.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/Type.h b/src/auth/Type.h index 39f58b4126..ff49175a47 100644 --- a/src/auth/Type.h +++ b/src/auth/Type.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/User.cc b/src/auth/User.cc index 67d3590b33..a1a429bf14 100644 --- a/src/auth/User.cc +++ b/src/auth/User.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -32,7 +32,7 @@ Auth::User::User(Auth::SchemeConfig *aConfig, const char *aRequestRealm) : { proxy_match_cache.head = proxy_match_cache.tail = NULL; ip_list.head = ip_list.tail = NULL; - debugs(29, 5, HERE << "Initialised auth_user '" << this << "'."); + debugs(29, 5, "Initialised auth_user '" << this << "'."); } Auth::CredentialState @@ -64,7 +64,7 @@ Auth::User::absorb(Auth::User::Pointer from) * dlink_list proxy_match_cache; */ - debugs(29, 5, HERE << "auth_user '" << from << "' into auth_user '" << this << "'."); + debugs(29, 5, "auth_user '" << from << "' into auth_user '" << this << "'."); // combine the helper response annotations. Ensuring no duplicates are copied. notes.appendNewOnly(&from->notes); @@ -120,7 +120,7 @@ Auth::User::absorb(Auth::User::Pointer from) Auth::User::~User() { - debugs(29, 5, HERE << "Freeing auth_user '" << this << "'."); + debugs(29, 5, "Freeing auth_user '" << this << "'."); assert(LockCount() == 0); /* free cached acl results */ @@ -223,7 +223,7 @@ Auth::User::addIp(Ip::Address ipaddr) ++ipcount; - debugs(29, 2, HERE << "user '" << username() << "' has been seen at a new IP address (" << ipaddr << ")"); + debugs(29, 2, "user '" << username() << "' has been seen at a new IP address (" << ipaddr << ")"); } SBuf diff --git a/src/auth/User.h b/src/auth/User.h index 04dd03f9a9..1b6fa66c5c 100644 --- a/src/auth/User.h +++ b/src/auth/User.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/UserRequest.cc b/src/auth/UserRequest.cc index 388fe64b7f..670da2ca03 100644 --- a/src/auth/UserRequest.cc +++ b/src/auth/UserRequest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -52,27 +52,27 @@ Auth::UserRequest::start(HttpRequest *request, AccessLogEntry::Pointer &al, AUTH bool Auth::UserRequest::valid() const { - debugs(29, 9, HERE << "Validating Auth::UserRequest '" << this << "'."); + debugs(29, 9, "Validating Auth::UserRequest '" << this << "'."); if (user() == NULL) { - debugs(29, 4, HERE << "No associated Auth::User data"); + debugs(29, 4, "No associated Auth::User data"); return false; } if (user()->auth_type == Auth::AUTH_UNKNOWN) { - debugs(29, 4, HERE << "Auth::User '" << user() << "' uses unknown scheme."); + debugs(29, 4, "Auth::User '" << user() << "' uses unknown scheme."); return false; } if (user()->auth_type == Auth::AUTH_BROKEN) { - debugs(29, 4, HERE << "Auth::User '" << user() << "' is broken for it's scheme."); + debugs(29, 4, "Auth::User '" << user() << "' is broken for it's scheme."); return false; } /* any other sanity checks that we need in the future */ /* finally return ok */ - debugs(29, 5, HERE << "Validated. Auth::UserRequest '" << this << "'."); + debugs(29, 5, "Validated. Auth::UserRequest '" << this << "'."); return true; } @@ -94,13 +94,13 @@ Auth::UserRequest::UserRequest(): message(NULL), lastReply(AUTH_ACL_CANNOT_AUTHENTICATE) { - debugs(29, 5, HERE << "initialised request " << this); + debugs(29, 5, "initialised request " << this); } Auth::UserRequest::~UserRequest() { assert(LockCount()==0); - debugs(29, 5, HERE << "freeing request " << this); + debugs(29, 5, "freeing request " << this); if (user() != NULL) { /* release our references to the user credentials */ @@ -289,7 +289,7 @@ Auth::UserRequest::authenticate(Auth::UserRequest::Pointer * auth_user_request, /* a) can we find other credentials to use? and b) are they logged in already? */ if (proxy_auth == NULL && !authenticateUserAuthenticated(authTryGetUser(*auth_user_request,conn,request))) { /* no header or authentication failed/got corrupted - restart */ - debugs(29, 4, HERE << "No Proxy-Auth header and no working alternative. Requesting auth header."); + debugs(29, 4, "No Proxy-Auth header and no working alternative. Requesting auth header."); /* something wrong with the AUTH credentials. Force a new attempt */ @@ -327,11 +327,11 @@ Auth::UserRequest::authenticate(Auth::UserRequest::Pointer * auth_user_request, /* we have a proxy auth header and as far as we know this connection has * not had bungled connection oriented authentication happen on it. */ - debugs(29, 9, HERE << "header " << (proxy_auth ? proxy_auth : "-") << "."); + debugs(29, 9, "header " << (proxy_auth ? proxy_auth : "-") << "."); if (*auth_user_request == NULL) { if (conn != NULL) { - debugs(29, 9, HERE << "This is a new checklist test on:" << conn->clientConnection); + debugs(29, 9, "This is a new checklist test on:" << conn->clientConnection); } if (proxy_auth && request->auth_user_request == NULL && conn != NULL && conn->getAuth() != NULL) { @@ -349,7 +349,7 @@ Auth::UserRequest::authenticate(Auth::UserRequest::Pointer * auth_user_request, if (request->auth_user_request == NULL && (conn == NULL || conn->getAuth() == NULL)) { /* beginning of a new request check */ - debugs(29, 4, HERE << "No connection authentication type"); + debugs(29, 4, "No connection authentication type"); *auth_user_request = Auth::SchemeConfig::CreateAuthUser(proxy_auth, al); if (*auth_user_request == NULL) @@ -374,7 +374,7 @@ Auth::UserRequest::authenticate(Auth::UserRequest::Pointer * auth_user_request, *auth_user_request = conn->getAuth(); } else { /* failed connection based authentication */ - debugs(29, 4, HERE << "Auth user request " << *auth_user_request << " conn-auth missing and failed to authenticate."); + debugs(29, 4, "Auth user request " << *auth_user_request << " conn-auth missing and failed to authenticate."); *auth_user_request = NULL; return AUTH_ACL_CHALLENGE; } @@ -520,7 +520,7 @@ Auth::UserRequest::AddReplyAuthHeader(HttpReply * rep, Auth::UserRequest::Pointe else scheme->fixHeader(NULL, rep, type, request); } else - debugs(29, 4, HERE << "Configured scheme " << scheme->type() << " not Active"); + debugs(29, 4, "Configured scheme " << scheme->type() << " not Active"); } } diff --git a/src/auth/UserRequest.h b/src/auth/UserRequest.h index 9687bf8fad..0cc13bbd91 100644 --- a/src/auth/UserRequest.h +++ b/src/auth/UserRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/Config.cc b/src/auth/basic/Config.cc index 547e540b1d..485d99d72a 100644 --- a/src/auth/basic/Config.cc +++ b/src/auth/basic/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -59,11 +59,11 @@ bool Auth::Basic::Config::configured() const { if ((authenticateProgram != NULL) && (authenticateChildren.n_max != 0) && !realm.isEmpty()) { - debugs(29, 9, HERE << "returning configured"); + debugs(29, 9, "returning configured"); return true; } - debugs(29, 9, HERE << "returning unconfigured"); + debugs(29, 9, "returning unconfigured"); return false; } @@ -193,7 +193,7 @@ Auth::Basic::Config::decodeCleartext(const char *httpAuthHeader, const HttpReque * Don't allow NL or CR in the credentials. * Oezguer Kesim */ - debugs(29, 9, HERE << "'" << cleartext << "'"); + debugs(29, 9, "'" << cleartext << "'"); if (strcspn(cleartext, "\r\n") != strlen(cleartext)) { debugs(29, DBG_IMPORTANT, "WARNING: Bad characters in authorization header '" << httpAuthHeader << "'"); @@ -247,11 +247,11 @@ Auth::Basic::Config::decode(char const *proxy_auth, const HttpRequest *request, local_basic->username(cleartext); if (local_basic->passwd == NULL) { - debugs(29, 4, HERE << "no password in proxy authorization header '" << proxy_auth << "'"); + debugs(29, 4, "no password in proxy authorization header '" << proxy_auth << "'"); auth_user_request->setDenyMessage("no password was present in the HTTP [proxy-]authorization header. This is most likely a browser bug"); } else { if (local_basic->passwd[0] == '\0') { - debugs(29, 4, HERE << "Disallowing empty password. User is '" << local_basic->username() << "'"); + debugs(29, 4, "Disallowing empty password. User is '" << local_basic->username() << "'"); safe_free(local_basic->passwd); auth_user_request->setDenyMessage("Request denied because you provided an empty password. Users MUST have a password."); } @@ -271,7 +271,7 @@ Auth::Basic::Config::decode(char const *proxy_auth, const HttpRequest *request, if (!(auth_user = Auth::Basic::User::Cache()->lookup(lb->userKey()))) { /* the user doesn't exist in the username cache yet */ /* save the credentials */ - debugs(29, 9, HERE << "Creating new user '" << lb->username() << "'"); + debugs(29, 9, "Creating new user '" << lb->username() << "'"); /* set the auth_user type */ lb->auth_type = Auth::AUTH_BASIC; /* current time for timeouts */ diff --git a/src/auth/basic/Config.h b/src/auth/basic/Config.h index e126faec6d..878cdabdb5 100644 --- a/src/auth/basic/Config.h +++ b/src/auth/basic/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/DB/Makefile.am b/src/auth/basic/DB/Makefile.am index 1147c5f14e..a7da053c0e 100644 --- a/src/auth/basic/DB/Makefile.am +++ b/src/auth/basic/DB/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/DB/basic_db_auth.pl.in b/src/auth/basic/DB/basic_db_auth.pl.in index b213475697..98279c418e 100644 --- a/src/auth/basic/DB/basic_db_auth.pl.in +++ b/src/auth/basic/DB/basic_db_auth.pl.in @@ -92,7 +92,7 @@ This manual was written by I> =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/DB/passwd.sql b/src/auth/basic/DB/passwd.sql index 066c401fcd..9859421bb7 100644 --- a/src/auth/basic/DB/passwd.sql +++ b/src/auth/basic/DB/passwd.sql @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/DB/required.m4 b/src/auth/basic/DB/required.m4 index 56956450cd..add8fd8872 100755 --- a/src/auth/basic/DB/required.m4 +++ b/src/auth/basic/DB/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/LDAP/Makefile.am b/src/auth/basic/LDAP/Makefile.am index afed66b25e..9e3b204a91 100644 --- a/src/auth/basic/LDAP/Makefile.am +++ b/src/auth/basic/LDAP/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/LDAP/basic_ldap_auth.8 b/src/auth/basic/LDAP/basic_ldap_auth.8 index e9fecb0ec4..71a4f85e4d 100644 --- a/src/auth/basic/LDAP/basic_ldap_auth.8 +++ b/src/auth/basic/LDAP/basic_ldap_auth.8 @@ -305,7 +305,7 @@ This manual is written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/LDAP/basic_ldap_auth.cc b/src/auth/basic/LDAP/basic_ldap_auth.cc index 55f17c2b25..407585a46a 100644 --- a/src/auth/basic/LDAP/basic_ldap_auth.cc +++ b/src/auth/basic/LDAP/basic_ldap_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/LDAP/required.m4 b/src/auth/basic/LDAP/required.m4 index 4ac5274deb..e567bdcfe3 100755 --- a/src/auth/basic/LDAP/required.m4 +++ b/src/auth/basic/LDAP/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/Makefile.am b/src/auth/basic/Makefile.am index c1f2cb96cf..7990fbd972 100644 --- a/src/auth/basic/Makefile.am +++ b/src/auth/basic/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NCSA/Makefile.am b/src/auth/basic/NCSA/Makefile.am index d5cad62889..7963aa5189 100644 --- a/src/auth/basic/NCSA/Makefile.am +++ b/src/auth/basic/NCSA/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NCSA/basic_ncsa_auth.8 b/src/auth/basic/NCSA/basic_ncsa_auth.8 index 82cbc86b2a..ac3eb0ee1f 100644 --- a/src/auth/basic/NCSA/basic_ncsa_auth.8 +++ b/src/auth/basic/NCSA/basic_ncsa_auth.8 @@ -57,7 +57,7 @@ Based on original documentation by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NCSA/basic_ncsa_auth.cc b/src/auth/basic/NCSA/basic_ncsa_auth.cc index faba7f7c66..11d721f616 100644 --- a/src/auth/basic/NCSA/basic_ncsa_auth.cc +++ b/src/auth/basic/NCSA/basic_ncsa_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NCSA/crypt_md5.cc b/src/auth/basic/NCSA/crypt_md5.cc index 5ee7e56cd4..ec99aeb991 100644 --- a/src/auth/basic/NCSA/crypt_md5.cc +++ b/src/auth/basic/NCSA/crypt_md5.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NCSA/crypt_md5.h b/src/auth/basic/NCSA/crypt_md5.h index 39b80b8cbe..3c55bd176f 100644 --- a/src/auth/basic/NCSA/crypt_md5.h +++ b/src/auth/basic/NCSA/crypt_md5.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NCSA/required.m4 b/src/auth/basic/NCSA/required.m4 index 043055fdb4..c4e900d16b 100755 --- a/src/auth/basic/NCSA/required.m4 +++ b/src/auth/basic/NCSA/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NIS/Makefile.am b/src/auth/basic/NIS/Makefile.am index dd6543072f..9b9252d2c0 100644 --- a/src/auth/basic/NIS/Makefile.am +++ b/src/auth/basic/NIS/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NIS/basic_nis_auth.cc b/src/auth/basic/NIS/basic_nis_auth.cc index 07212408f3..02ced75f55 100644 --- a/src/auth/basic/NIS/basic_nis_auth.cc +++ b/src/auth/basic/NIS/basic_nis_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NIS/nis_support.cc b/src/auth/basic/NIS/nis_support.cc index c067167bdb..7a511f899a 100644 --- a/src/auth/basic/NIS/nis_support.cc +++ b/src/auth/basic/NIS/nis_support.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NIS/nis_support.h b/src/auth/basic/NIS/nis_support.h index f82af7c224..5bd0d97403 100644 --- a/src/auth/basic/NIS/nis_support.h +++ b/src/auth/basic/NIS/nis_support.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/NIS/required.m4 b/src/auth/basic/NIS/required.m4 index 0a299db3cb..be6b8906c8 100755 --- a/src/auth/basic/NIS/required.m4 +++ b/src/auth/basic/NIS/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/PAM/Makefile.am b/src/auth/basic/PAM/Makefile.am index 9e25ce19a1..7a6d0121f2 100644 --- a/src/auth/basic/PAM/Makefile.am +++ b/src/auth/basic/PAM/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/PAM/basic_pam_auth.8 b/src/auth/basic/PAM/basic_pam_auth.8 index b9897f8be5..58a9172694 100644 --- a/src/auth/basic/PAM/basic_pam_auth.8 +++ b/src/auth/basic/PAM/basic_pam_auth.8 @@ -81,7 +81,7 @@ This program and documentation was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/PAM/basic_pam_auth.cc b/src/auth/basic/PAM/basic_pam_auth.cc index 8d1790ea20..b54ae2e375 100644 --- a/src/auth/basic/PAM/basic_pam_auth.cc +++ b/src/auth/basic/PAM/basic_pam_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/PAM/required.m4 b/src/auth/basic/PAM/required.m4 index 0486e007a8..2061a54b8f 100755 --- a/src/auth/basic/PAM/required.m4 +++ b/src/auth/basic/PAM/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/POP3/Makefile.am b/src/auth/basic/POP3/Makefile.am index 1a11c213f0..f779c182b1 100644 --- a/src/auth/basic/POP3/Makefile.am +++ b/src/auth/basic/POP3/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/POP3/basic_pop3_auth.pl.in b/src/auth/basic/POP3/basic_pop3_auth.pl.in index 99e296b8bd..868309153b 100755 --- a/src/auth/basic/POP3/basic_pop3_auth.pl.in +++ b/src/auth/basic/POP3/basic_pop3_auth.pl.in @@ -30,7 +30,7 @@ This manual was written by I> =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/POP3/required.m4 b/src/auth/basic/POP3/required.m4 index c225761791..27630696e7 100755 --- a/src/auth/basic/POP3/required.m4 +++ b/src/auth/basic/POP3/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/RADIUS/Makefile.am b/src/auth/basic/RADIUS/Makefile.am index d84ddd2ea6..4f7cd55554 100644 --- a/src/auth/basic/RADIUS/Makefile.am +++ b/src/auth/basic/RADIUS/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/RADIUS/basic_radius_auth.8 b/src/auth/basic/RADIUS/basic_radius_auth.8 index 301c33bc0c..cd2302a92b 100644 --- a/src/auth/basic/RADIUS/basic_radius_auth.8 +++ b/src/auth/basic/RADIUS/basic_radius_auth.8 @@ -96,7 +96,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/RADIUS/basic_radius_auth.cc b/src/auth/basic/RADIUS/basic_radius_auth.cc index 9b965b0a08..27264b6ef3 100644 --- a/src/auth/basic/RADIUS/basic_radius_auth.cc +++ b/src/auth/basic/RADIUS/basic_radius_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/RADIUS/radius-util.cc b/src/auth/basic/RADIUS/radius-util.cc index 04e53d1ff3..758afee3c8 100644 --- a/src/auth/basic/RADIUS/radius-util.cc +++ b/src/auth/basic/RADIUS/radius-util.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/RADIUS/radius-util.h b/src/auth/basic/RADIUS/radius-util.h index f4bd52bda2..78332a50bd 100644 --- a/src/auth/basic/RADIUS/radius-util.h +++ b/src/auth/basic/RADIUS/radius-util.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/RADIUS/radius.h b/src/auth/basic/RADIUS/radius.h index 465e15691a..fe2c2d3e77 100644 --- a/src/auth/basic/RADIUS/radius.h +++ b/src/auth/basic/RADIUS/radius.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/RADIUS/required.m4 b/src/auth/basic/RADIUS/required.m4 index ecffd50203..c1afbc2a42 100755 --- a/src/auth/basic/RADIUS/required.m4 +++ b/src/auth/basic/RADIUS/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SASL/Makefile.am b/src/auth/basic/SASL/Makefile.am index abbe635a79..e74ddcf12c 100644 --- a/src/auth/basic/SASL/Makefile.am +++ b/src/auth/basic/SASL/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SASL/basic_sasl_auth.8 b/src/auth/basic/SASL/basic_sasl_auth.8 index 3c9c1f7c08..dd4cfb1b22 100644 --- a/src/auth/basic/SASL/basic_sasl_auth.8 +++ b/src/auth/basic/SASL/basic_sasl_auth.8 @@ -80,7 +80,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SASL/basic_sasl_auth.cc b/src/auth/basic/SASL/basic_sasl_auth.cc index e83cd115aa..5468e1c311 100644 --- a/src/auth/basic/SASL/basic_sasl_auth.cc +++ b/src/auth/basic/SASL/basic_sasl_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SASL/basic_sasl_auth.conf b/src/auth/basic/SASL/basic_sasl_auth.conf index c7fd0e3164..d3effed683 100644 --- a/src/auth/basic/SASL/basic_sasl_auth.conf +++ b/src/auth/basic/SASL/basic_sasl_auth.conf @@ -1,5 +1,5 @@ ## -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SASL/basic_sasl_auth.pam b/src/auth/basic/SASL/basic_sasl_auth.pam index 7ba22fb71e..943ccfdb9f 100644 --- a/src/auth/basic/SASL/basic_sasl_auth.pam +++ b/src/auth/basic/SASL/basic_sasl_auth.pam @@ -1,6 +1,6 @@ #%PAM-1.0 ## -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SASL/required.m4 b/src/auth/basic/SASL/required.m4 index 6b9bc7038f..c69b34cda4 100755 --- a/src/auth/basic/SASL/required.m4 +++ b/src/auth/basic/SASL/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB/Makefile.am b/src/auth/basic/SMB/Makefile.am index 8458d61123..edfb8bca17 100644 --- a/src/auth/basic/SMB/Makefile.am +++ b/src/auth/basic/SMB/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB/basic_smb_auth.cc b/src/auth/basic/SMB/basic_smb_auth.cc index 24541b7fc2..7809ac2789 100644 --- a/src/auth/basic/SMB/basic_smb_auth.cc +++ b/src/auth/basic/SMB/basic_smb_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB/basic_smb_auth.sh b/src/auth/basic/SMB/basic_smb_auth.sh index a2b95e85bd..cf8e9f0b2a 100755 --- a/src/auth/basic/SMB/basic_smb_auth.sh +++ b/src/auth/basic/SMB/basic_smb_auth.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB/required.m4 b/src/auth/basic/SMB/required.m4 index 2c9bbda2b8..3a2d68eeab 100755 --- a/src/auth/basic/SMB/required.m4 +++ b/src/auth/basic/SMB/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB_LM/Makefile.am b/src/auth/basic/SMB_LM/Makefile.am index 4ad8913657..d92e0b7c7b 100644 --- a/src/auth/basic/SMB_LM/Makefile.am +++ b/src/auth/basic/SMB_LM/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB_LM/msntauth.cc b/src/auth/basic/SMB_LM/msntauth.cc index 6be8326f3e..3e8cd89f96 100644 --- a/src/auth/basic/SMB_LM/msntauth.cc +++ b/src/auth/basic/SMB_LM/msntauth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB_LM/msntauth.h b/src/auth/basic/SMB_LM/msntauth.h index 36e56d0a6e..9182c728b1 100644 --- a/src/auth/basic/SMB_LM/msntauth.h +++ b/src/auth/basic/SMB_LM/msntauth.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB_LM/required.m4 b/src/auth/basic/SMB_LM/required.m4 index 3304a09cb4..b979f2c468 100755 --- a/src/auth/basic/SMB_LM/required.m4 +++ b/src/auth/basic/SMB_LM/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB_LM/valid.cc b/src/auth/basic/SMB_LM/valid.cc index 9b36871fc0..8faf40cbc5 100644 --- a/src/auth/basic/SMB_LM/valid.cc +++ b/src/auth/basic/SMB_LM/valid.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SMB_LM/valid.h b/src/auth/basic/SMB_LM/valid.h index c1f607d620..9d8845ab6d 100644 --- a/src/auth/basic/SMB_LM/valid.h +++ b/src/auth/basic/SMB_LM/valid.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SSPI/Makefile.am b/src/auth/basic/SSPI/Makefile.am index cfa2b4104d..9c559383f6 100644 --- a/src/auth/basic/SSPI/Makefile.am +++ b/src/auth/basic/SSPI/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SSPI/basic_sspi_auth.8 b/src/auth/basic/SSPI/basic_sspi_auth.8 index e8e76b4493..9346133c61 100644 --- a/src/auth/basic/SSPI/basic_sspi_auth.8 +++ b/src/auth/basic/SSPI/basic_sspi_auth.8 @@ -134,7 +134,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SSPI/basic_sspi_auth.cc b/src/auth/basic/SSPI/basic_sspi_auth.cc index 6e13fe47c3..21fd79e8fa 100644 --- a/src/auth/basic/SSPI/basic_sspi_auth.cc +++ b/src/auth/basic/SSPI/basic_sspi_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SSPI/required.m4 b/src/auth/basic/SSPI/required.m4 index 74a4999323..d5490645ca 100755 --- a/src/auth/basic/SSPI/required.m4 +++ b/src/auth/basic/SSPI/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SSPI/valid.cc b/src/auth/basic/SSPI/valid.cc index 55e3b58e20..4fea1f7272 100644 --- a/src/auth/basic/SSPI/valid.cc +++ b/src/auth/basic/SSPI/valid.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/SSPI/valid.h b/src/auth/basic/SSPI/valid.h index b604f86bb0..bad5fe2cb9 100644 --- a/src/auth/basic/SSPI/valid.h +++ b/src/auth/basic/SSPI/valid.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/Scheme.cc b/src/auth/basic/Scheme.cc index 5d8161a898..47cde30a85 100644 --- a/src/auth/basic/Scheme.cc +++ b/src/auth/basic/Scheme.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/Scheme.h b/src/auth/basic/Scheme.h index 834ab58aba..58c712a58d 100644 --- a/src/auth/basic/Scheme.h +++ b/src/auth/basic/Scheme.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/User.cc b/src/auth/basic/User.cc index e0ae311cdd..73d0280b46 100644 --- a/src/auth/basic/User.cc +++ b/src/auth/basic/User.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -61,12 +61,12 @@ Auth::Basic::User::valid() const void Auth::Basic::User::updateCached(Auth::Basic::User *from) { - debugs(29, 9, HERE << "Found user '" << from->username() << "' already in the user cache as '" << this << "'"); + debugs(29, 9, "Found user '" << from->username() << "' already in the user cache as '" << this << "'"); assert(strcmp(from->username(), username()) == 0); if (strcmp(from->passwd, passwd)) { - debugs(29, 4, HERE << "new password found. Updating in user master record and resetting auth state to unchecked"); + debugs(29, 4, "new password found. Updating in user master record and resetting auth state to unchecked"); credentials(Auth::Unchecked); xfree(passwd); passwd = from->passwd; @@ -74,7 +74,7 @@ Auth::Basic::User::updateCached(Auth::Basic::User *from) } if (credentials() == Auth::Failed) { - debugs(29, 4, HERE << "last attempt to authenticate this user failed, resetting auth state to unchecked"); + debugs(29, 4, "last attempt to authenticate this user failed, resetting auth state to unchecked"); credentials(Auth::Unchecked); } } diff --git a/src/auth/basic/User.h b/src/auth/basic/User.h index 85c5a7681c..e87a9ab7e2 100644 --- a/src/auth/basic/User.h +++ b/src/auth/basic/User.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/UserRequest.cc b/src/auth/basic/UserRequest.cc index 7124b44f42..d208619600 100644 --- a/src/auth/basic/UserRequest.cc +++ b/src/auth/basic/UserRequest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -58,12 +58,12 @@ Auth::Basic::UserRequest::authenticate(HttpRequest *, ConnStateData *, Http::Hdr /* are we about to recheck the credentials externally? */ if ((user()->expiretime + static_cast(Auth::SchemeConfig::Find("basic"))->credentialsTTL) <= squid_curtime) { - debugs(29, 4, HERE << "credentials expired - rechecking"); + debugs(29, 4, "credentials expired - rechecking"); return; } /* we have been through the external helper, and the credentials haven't expired */ - debugs(29, 9, HERE << "user '" << user()->username() << "' authenticated"); + debugs(29, 9, "user '" << user()->username() << "' authenticated"); /* Decode now takes care of finding the AuthUser struct in the cache */ /* after external auth occurs anyway */ @@ -103,7 +103,7 @@ Auth::Basic::UserRequest::startHelperLookup(HttpRequest *request, AccessLogEntry assert(user()->auth_type == Auth::AUTH_BASIC); Auth::Basic::User *basic_auth = dynamic_cast(user().getRaw()); assert(basic_auth != NULL); - debugs(29, 9, HERE << "'" << basic_auth->username() << ":" << basic_auth->passwd << "'"); + debugs(29, 9, "'" << basic_auth->username() << ":" << basic_auth->passwd << "'"); if (static_cast(Auth::SchemeConfig::Find("basic"))->authenticateProgram == NULL) { debugs(29, DBG_CRITICAL, "ERROR: No Basic authentication program configured."); @@ -155,7 +155,7 @@ Auth::Basic::UserRequest::HandleReply(void *data, const Helper::Reply &reply) { Auth::StateData *r = static_cast(data); void *cbdata; - debugs(29, 5, HERE << "reply=" << reply); + debugs(29, 5, "reply=" << reply); assert(r->auth_user_request != NULL); assert(r->auth_user_request->user()->auth_type == Auth::AUTH_BASIC); diff --git a/src/auth/basic/UserRequest.h b/src/auth/basic/UserRequest.h index a7cc455c8e..800755cfdd 100644 --- a/src/auth/basic/UserRequest.h +++ b/src/auth/basic/UserRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/fake/Makefile.am b/src/auth/basic/fake/Makefile.am index 718ef50655..76ae0f89ee 100644 --- a/src/auth/basic/fake/Makefile.am +++ b/src/auth/basic/fake/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/fake/fake.cc b/src/auth/basic/fake/fake.cc index a8fead0f1d..8fe060f799 100644 --- a/src/auth/basic/fake/fake.cc +++ b/src/auth/basic/fake/fake.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/fake/required.m4 b/src/auth/basic/fake/required.m4 index 19872bf5c8..62ba618cca 100755 --- a/src/auth/basic/fake/required.m4 +++ b/src/auth/basic/fake/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/getpwnam/Makefile.am b/src/auth/basic/getpwnam/Makefile.am index 7c2feea80b..caaf81d7d2 100644 --- a/src/auth/basic/getpwnam/Makefile.am +++ b/src/auth/basic/getpwnam/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/getpwnam/basic_getpwnam_auth.8 b/src/auth/basic/getpwnam/basic_getpwnam_auth.8 index 1bb9ca4d17..2328475bf0 100644 --- a/src/auth/basic/getpwnam/basic_getpwnam_auth.8 +++ b/src/auth/basic/getpwnam/basic_getpwnam_auth.8 @@ -74,7 +74,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/getpwnam/basic_getpwnam_auth.cc b/src/auth/basic/getpwnam/basic_getpwnam_auth.cc index 79620303af..6a9164c8dc 100644 --- a/src/auth/basic/getpwnam/basic_getpwnam_auth.cc +++ b/src/auth/basic/getpwnam/basic_getpwnam_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/basic/getpwnam/required.m4 b/src/auth/basic/getpwnam/required.m4 index 5a9372157a..29508b462a 100755 --- a/src/auth/basic/getpwnam/required.m4 +++ b/src/auth/basic/getpwnam/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/basic/helpers.m4 b/src/auth/basic/helpers.m4 index 2707238c67..9d51160ba1 100644 --- a/src/auth/basic/helpers.m4 +++ b/src/auth/basic/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/digest/Config.cc b/src/auth/digest/Config.cc index 968e242c85..c785bc3cb9 100644 --- a/src/auth/digest/Config.cc +++ b/src/auth/digest/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/Config.h b/src/auth/digest/Config.h index 5bbc1b89c3..9d3f4f377c 100644 --- a/src/auth/digest/Config.h +++ b/src/auth/digest/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/LDAP/Makefile.am b/src/auth/digest/LDAP/Makefile.am index dfd3a22fd3..c4afa43897 100644 --- a/src/auth/digest/LDAP/Makefile.am +++ b/src/auth/digest/LDAP/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/digest/LDAP/digest_common.h b/src/auth/digest/LDAP/digest_common.h index 17302f7955..ae7ccbae25 100644 --- a/src/auth/digest/LDAP/digest_common.h +++ b/src/auth/digest/LDAP/digest_common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/LDAP/digest_pw_auth.cc b/src/auth/digest/LDAP/digest_pw_auth.cc index f5209eae9a..0932a0cc66 100644 --- a/src/auth/digest/LDAP/digest_pw_auth.cc +++ b/src/auth/digest/LDAP/digest_pw_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/LDAP/ldap_backend.cc b/src/auth/digest/LDAP/ldap_backend.cc index ac511461cd..b77d9860c2 100644 --- a/src/auth/digest/LDAP/ldap_backend.cc +++ b/src/auth/digest/LDAP/ldap_backend.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/LDAP/ldap_backend.h b/src/auth/digest/LDAP/ldap_backend.h index 977031c2e8..e5c09bb26a 100644 --- a/src/auth/digest/LDAP/ldap_backend.h +++ b/src/auth/digest/LDAP/ldap_backend.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/LDAP/required.m4 b/src/auth/digest/LDAP/required.m4 index 4ac5274deb..e567bdcfe3 100755 --- a/src/auth/digest/LDAP/required.m4 +++ b/src/auth/digest/LDAP/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/digest/Makefile.am b/src/auth/digest/Makefile.am index 2774797594..23921feeba 100644 --- a/src/auth/digest/Makefile.am +++ b/src/auth/digest/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/digest/Scheme.cc b/src/auth/digest/Scheme.cc index ef46f0022d..ad303d4a71 100644 --- a/src/auth/digest/Scheme.cc +++ b/src/auth/digest/Scheme.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/Scheme.h b/src/auth/digest/Scheme.h index 4266334371..1f62adbe58 100644 --- a/src/auth/digest/Scheme.h +++ b/src/auth/digest/Scheme.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc index 9c2f094fd1..a0b9157242 100644 --- a/src/auth/digest/User.cc +++ b/src/auth/digest/User.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/User.h b/src/auth/digest/User.h index 507677b214..c9135eb9a0 100644 --- a/src/auth/digest/User.h +++ b/src/auth/digest/User.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/UserRequest.cc b/src/auth/digest/UserRequest.cc index 9d7bcca046..81cae2ffb1 100644 --- a/src/auth/digest/UserRequest.cc +++ b/src/auth/digest/UserRequest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -288,7 +288,7 @@ Auth::Digest::UserRequest::startHelperLookup(HttpRequest *request, AccessLogEntr char buf[8192]; assert(user() != NULL && user()->auth_type == Auth::AUTH_DIGEST); - debugs(29, 9, HERE << "'\"" << user()->username() << "\":\"" << realm << "\"'"); + debugs(29, 9, "'\"" << user()->username() << "\":\"" << realm << "\"'"); if (static_cast(Auth::SchemeConfig::Find("digest"))->authenticateProgram == NULL) { debugs(29, DBG_CRITICAL, "ERROR: No Digest authentication program configured."); @@ -310,7 +310,7 @@ void Auth::Digest::UserRequest::HandleReply(void *data, const Helper::Reply &reply) { Auth::StateData *replyData = static_cast(data); - debugs(29, 9, HERE << "reply=" << reply); + debugs(29, 9, "reply=" << reply); assert(replyData->auth_user_request != NULL); Auth::UserRequest::Pointer auth_user_request = replyData->auth_user_request; diff --git a/src/auth/digest/UserRequest.h b/src/auth/digest/UserRequest.h index ed414c51b5..afc709d582 100644 --- a/src/auth/digest/UserRequest.h +++ b/src/auth/digest/UserRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/eDirectory/Makefile.am b/src/auth/digest/eDirectory/Makefile.am index aca43e643f..baba329ac6 100644 --- a/src/auth/digest/eDirectory/Makefile.am +++ b/src/auth/digest/eDirectory/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/digest/eDirectory/digest_common.h b/src/auth/digest/eDirectory/digest_common.h index 96bf33d9a8..e88b0dd87f 100644 --- a/src/auth/digest/eDirectory/digest_common.h +++ b/src/auth/digest/eDirectory/digest_common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/eDirectory/digest_pw_auth.cc b/src/auth/digest/eDirectory/digest_pw_auth.cc index 94d87636cc..639cd3069d 100644 --- a/src/auth/digest/eDirectory/digest_pw_auth.cc +++ b/src/auth/digest/eDirectory/digest_pw_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/eDirectory/edir_ldapext.cc b/src/auth/digest/eDirectory/edir_ldapext.cc index fff0115cb1..439c9c0206 100644 --- a/src/auth/digest/eDirectory/edir_ldapext.cc +++ b/src/auth/digest/eDirectory/edir_ldapext.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/eDirectory/edir_ldapext.h b/src/auth/digest/eDirectory/edir_ldapext.h index 76529f8104..fd7a412f25 100644 --- a/src/auth/digest/eDirectory/edir_ldapext.h +++ b/src/auth/digest/eDirectory/edir_ldapext.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/eDirectory/ldap_backend.cc b/src/auth/digest/eDirectory/ldap_backend.cc index 5827af6d7d..feeb5dc516 100644 --- a/src/auth/digest/eDirectory/ldap_backend.cc +++ b/src/auth/digest/eDirectory/ldap_backend.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/eDirectory/ldap_backend.h b/src/auth/digest/eDirectory/ldap_backend.h index 62f954c45f..ecb7d8597b 100644 --- a/src/auth/digest/eDirectory/ldap_backend.h +++ b/src/auth/digest/eDirectory/ldap_backend.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/eDirectory/required.m4 b/src/auth/digest/eDirectory/required.m4 index ba987dacfd..66214ed334 100755 --- a/src/auth/digest/eDirectory/required.m4 +++ b/src/auth/digest/eDirectory/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/digest/file/Makefile.am b/src/auth/digest/file/Makefile.am index 549895b972..235d3293e4 100644 --- a/src/auth/digest/file/Makefile.am +++ b/src/auth/digest/file/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/digest/file/digest_common.h b/src/auth/digest/file/digest_common.h index ae4dbbad4e..b857983c91 100644 --- a/src/auth/digest/file/digest_common.h +++ b/src/auth/digest/file/digest_common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/file/digest_file_auth.8 b/src/auth/digest/file/digest_file_auth.8 index 47332ca65a..306d419392 100644 --- a/src/auth/digest/file/digest_file_auth.8 +++ b/src/auth/digest/file/digest_file_auth.8 @@ -71,7 +71,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/file/digest_file_auth.cc b/src/auth/digest/file/digest_file_auth.cc index 2ca80677ee..c552bbae3c 100644 --- a/src/auth/digest/file/digest_file_auth.cc +++ b/src/auth/digest/file/digest_file_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/file/required.m4 b/src/auth/digest/file/required.m4 index 31f5b079cc..e06996df4a 100755 --- a/src/auth/digest/file/required.m4 +++ b/src/auth/digest/file/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/digest/file/text_backend.cc b/src/auth/digest/file/text_backend.cc index 487747c848..7e8bf6b18c 100644 --- a/src/auth/digest/file/text_backend.cc +++ b/src/auth/digest/file/text_backend.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/file/text_backend.h b/src/auth/digest/file/text_backend.h index 7b7c3186a5..57f58ebd4b 100644 --- a/src/auth/digest/file/text_backend.h +++ b/src/auth/digest/file/text_backend.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/digest/helpers.m4 b/src/auth/digest/helpers.m4 index c0df5efc70..6b1176db99 100644 --- a/src/auth/digest/helpers.m4 +++ b/src/auth/digest/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/forward.h b/src/auth/forward.h index 33433cc856..abbdb0988f 100644 --- a/src/auth/forward.h +++ b/src/auth/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/Config.cc b/src/auth/negotiate/Config.cc index a86084b780..b1756730e1 100644 --- a/src/auth/negotiate/Config.cc +++ b/src/auth/negotiate/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -126,11 +126,11 @@ bool Auth::Negotiate::Config::configured() const { if (authenticateProgram && (authenticateChildren.n_max != 0)) { - debugs(29, 9, HERE << "returning configured"); + debugs(29, 9, "returning configured"); return true; } - debugs(29, 9, HERE << "returning unconfigured"); + debugs(29, 9, "returning unconfigured"); return false; } @@ -146,7 +146,7 @@ Auth::Negotiate::Config::fixHeader(Auth::UserRequest::Pointer auth_user_request, /* New request, no user details */ if (auth_user_request == NULL) { - debugs(29, 9, HERE << "Sending type:" << reqType << " header: 'Negotiate'"); + debugs(29, 9, "Sending type:" << reqType << " header: 'Negotiate'"); httpHeaderPutStrf(&rep->header, reqType, "Negotiate"); if (!keep_alive) { @@ -172,11 +172,11 @@ Auth::Negotiate::Config::fixHeader(Auth::UserRequest::Pointer auth_user_request, * Need to start over to give the client another chance. */ if (negotiate_request->server_blob) { - debugs(29, 9, HERE << "Sending type:" << reqType << " header: 'Negotiate " << negotiate_request->server_blob << "'"); + debugs(29, 9, "Sending type:" << reqType << " header: 'Negotiate " << negotiate_request->server_blob << "'"); httpHeaderPutStrf(&rep->header, reqType, "Negotiate %s", negotiate_request->server_blob); safe_free(negotiate_request->server_blob); } else { - debugs(29, 9, HERE << "Connection authenticated"); + debugs(29, 9, "Connection authenticated"); httpHeaderPutStrf(&rep->header, reqType, "Negotiate"); } break; @@ -184,13 +184,13 @@ Auth::Negotiate::Config::fixHeader(Auth::UserRequest::Pointer auth_user_request, case Auth::Unchecked: /* semantic change: do not drop the connection. * 2.5 implementation used to keep it open - Kinkie */ - debugs(29, 9, HERE << "Sending type:" << reqType << " header: 'Negotiate'"); + debugs(29, 9, "Sending type:" << reqType << " header: 'Negotiate'"); httpHeaderPutStrf(&rep->header, reqType, "Negotiate"); break; case Auth::Handshake: /* we're waiting for a response from the client. Pass it the blob */ - debugs(29, 9, HERE << "Sending type:" << reqType << " header: 'Negotiate " << negotiate_request->server_blob << "'"); + debugs(29, 9, "Sending type:" << reqType << " header: 'Negotiate " << negotiate_request->server_blob << "'"); httpHeaderPutStrf(&rep->header, reqType, "Negotiate %s", negotiate_request->server_blob); safe_free(negotiate_request->server_blob); break; @@ -226,7 +226,7 @@ Auth::Negotiate::Config::decode(char const *proxy_auth, const HttpRequest *, con auth_user_request->user()->BuildUserKey(proxy_auth, aRequestRealm); /* all we have to do is identify that it's Negotiate - the helper does the rest */ - debugs(29, 9, HERE << "decode Negotiate authentication"); + debugs(29, 9, "decode Negotiate authentication"); return auth_user_request; } diff --git a/src/auth/negotiate/Config.h b/src/auth/negotiate/Config.h index 130471ebab..ebdac77811 100644 --- a/src/auth/negotiate/Config.h +++ b/src/auth/negotiate/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/Makefile.am b/src/auth/negotiate/Makefile.am index 00aa2fce5e..6dcf4b0420 100644 --- a/src/auth/negotiate/Makefile.am +++ b/src/auth/negotiate/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/SSPI/Makefile.am b/src/auth/negotiate/SSPI/Makefile.am index b86d24defc..6fa18218cc 100644 --- a/src/auth/negotiate/SSPI/Makefile.am +++ b/src/auth/negotiate/SSPI/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/SSPI/negotiate_sspi_auth.8 b/src/auth/negotiate/SSPI/negotiate_sspi_auth.8 index a9d7bb7568..e496201866 100644 --- a/src/auth/negotiate/SSPI/negotiate_sspi_auth.8 +++ b/src/auth/negotiate/SSPI/negotiate_sspi_auth.8 @@ -73,7 +73,7 @@ Based on prior work of . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc b/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc index e37afca158..3f161b10b2 100644 --- a/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc +++ b/src/auth/negotiate/SSPI/negotiate_sspi_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/SSPI/required.m4 b/src/auth/negotiate/SSPI/required.m4 index 1f1a3d54f1..d8055c2362 100755 --- a/src/auth/negotiate/SSPI/required.m4 +++ b/src/auth/negotiate/SSPI/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/Scheme.cc b/src/auth/negotiate/Scheme.cc index 724620379a..d84c58bc08 100644 --- a/src/auth/negotiate/Scheme.cc +++ b/src/auth/negotiate/Scheme.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/Scheme.h b/src/auth/negotiate/Scheme.h index cae3d7ea1a..0610fb42a9 100644 --- a/src/auth/negotiate/Scheme.h +++ b/src/auth/negotiate/Scheme.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/User.cc b/src/auth/negotiate/User.cc index 8473c8c28a..f4da71dc53 100644 --- a/src/auth/negotiate/User.cc +++ b/src/auth/negotiate/User.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -19,7 +19,7 @@ Auth::Negotiate::User::User(Auth::SchemeConfig *aConfig, const char *aRequestRea Auth::Negotiate::User::~User() { - debugs(29, 5, HERE << "doing nothing to clear Negotiate scheme data for '" << this << "'"); + debugs(29, 5, "doing nothing to clear Negotiate scheme data for '" << this << "'"); } int32_t diff --git a/src/auth/negotiate/User.h b/src/auth/negotiate/User.h index 0f97659d37..bd56a55767 100644 --- a/src/auth/negotiate/User.h +++ b/src/auth/negotiate/User.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc index 3965e19403..e02fe56d47 100644 --- a/src/auth/negotiate/UserRequest.cc +++ b/src/auth/negotiate/UserRequest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -58,11 +58,11 @@ int Auth::Negotiate::UserRequest::authenticated() const { if (user() != NULL && user()->credentials() == Auth::Ok) { - debugs(29, 9, HERE << "user authenticated."); + debugs(29, 9, "user authenticated."); return 1; } - debugs(29, 9, HERE << "user not fully authenticated."); + debugs(29, 9, "user not fully authenticated."); return 0; } @@ -133,7 +133,7 @@ Auth::Negotiate::UserRequest::startHelperLookup(HttpRequest *, AccessLogEntry::P return; } - debugs(29, 8, HERE << "credentials state is '" << user()->credentials() << "'"); + debugs(29, 8, "credentials state is '" << user()->credentials() << "'"); const char *keyExtras = helperRequestKeyExtras(request, al); int printResult = 0; @@ -178,7 +178,7 @@ Auth::Negotiate::UserRequest::releaseAuthServer() negotiateauthenticators->cancelReservation(reservationId); reservationId.clear(); } else - debugs(29, 6, HERE << "No Negotiate auth server to release."); + debugs(29, 6, "No Negotiate auth server to release."); } void @@ -199,7 +199,7 @@ Auth::Negotiate::UserRequest::authenticate(HttpRequest * aRequest, ConnStateData } if (server_blob) { - debugs(29, 2, HERE << "need to challenge client '" << server_blob << "'!"); + debugs(29, 2, "need to challenge client '" << server_blob << "'!"); return; } @@ -224,7 +224,7 @@ Auth::Negotiate::UserRequest::authenticate(HttpRequest * aRequest, ConnStateData case Auth::Unchecked: /* we've received a negotiate request. pass to a helper */ - debugs(29, 9, HERE << "auth state negotiate none. Received blob: '" << proxy_auth << "'"); + debugs(29, 9, "auth state negotiate none. Received blob: '" << proxy_auth << "'"); user()->credentials(Auth::Pending); safe_free(client_blob); client_blob=xstrdup(blob); @@ -235,7 +235,7 @@ Auth::Negotiate::UserRequest::authenticate(HttpRequest * aRequest, ConnStateData break; case Auth::Pending: - debugs(29, DBG_IMPORTANT, HERE << "need to ask helper"); + debugs(29, DBG_IMPORTANT, "need to ask helper"); break; case Auth::Handshake: @@ -255,7 +255,7 @@ Auth::Negotiate::UserRequest::authenticate(HttpRequest * aRequest, ConnStateData case Auth::Failed: /* we've failed somewhere in authentication */ - debugs(29, 9, HERE << "auth state negotiate failed. " << proxy_auth); + debugs(29, 9, "auth state negotiate failed. " << proxy_auth); break; } } @@ -308,7 +308,7 @@ Auth::Negotiate::UserRequest::HandleReply(void *data, const Helper::Reply &reply lm_request->server_blob = xstrdup(tokenNote); auth_user_request->user()->credentials(Auth::Handshake); auth_user_request->setDenyMessage("Authentication in progress"); - debugs(29, 4, HERE << "Need to challenge the client with a server token: '" << tokenNote << "'"); + debugs(29, 4, "Need to challenge the client with a server token: '" << tokenNote << "'"); } else { auth_user_request->user()->credentials(Auth::Failed); auth_user_request->setDenyMessage("Negotiate authentication requires a persistent connection"); @@ -333,7 +333,7 @@ Auth::Negotiate::UserRequest::HandleReply(void *data, const Helper::Reply &reply lm_request->releaseAuthServer(); /* connection is authenticated */ - debugs(29, 4, HERE << "authenticated user " << auth_user_request->user()->username()); + debugs(29, 4, "authenticated user " << auth_user_request->user()->username()); auto local_auth_user = lm_request->user(); auto cached_user = Auth::Negotiate::User::Cache()->lookup(auth_user_request->user()->userKey()); if (!cached_user) { @@ -352,7 +352,7 @@ Auth::Negotiate::UserRequest::HandleReply(void *data, const Helper::Reply &reply * existing user or a new user */ local_auth_user->expiretime = current_time.tv_sec; auth_user_request->user()->credentials(Auth::Ok); - debugs(29, 4, HERE << "Successfully validated user via Negotiate. Username '" << auth_user_request->user()->username() << "'"); + debugs(29, 4, "Successfully validated user via Negotiate. Username '" << auth_user_request->user()->username() << "'"); } break; diff --git a/src/auth/negotiate/UserRequest.h b/src/auth/negotiate/UserRequest.h index 54a30d398b..ade8a98e12 100644 --- a/src/auth/negotiate/UserRequest.h +++ b/src/auth/negotiate/UserRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/helpers.m4 b/src/auth/negotiate/helpers.m4 index 2d95736b95..b2a972f01e 100644 --- a/src/auth/negotiate/helpers.m4 +++ b/src/auth/negotiate/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/kerberos/Makefile.am b/src/auth/negotiate/kerberos/Makefile.am index b2d99f3e88..bab99bc635 100644 --- a/src/auth/negotiate/kerberos/Makefile.am +++ b/src/auth/negotiate/kerberos/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/kerberos/negotiate_kerberos.h b/src/auth/negotiate/kerberos/negotiate_kerberos.h index 76093aa474..dabd1a263b 100644 --- a/src/auth/negotiate/kerberos/negotiate_kerberos.h +++ b/src/auth/negotiate/kerberos/negotiate_kerberos.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/kerberos/negotiate_kerberos_auth.cc b/src/auth/negotiate/kerberos/negotiate_kerberos_auth.cc index 4e61895628..0b38be7bf3 100644 --- a/src/auth/negotiate/kerberos/negotiate_kerberos_auth.cc +++ b/src/auth/negotiate/kerberos/negotiate_kerberos_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/kerberos/negotiate_kerberos_auth_test.cc b/src/auth/negotiate/kerberos/negotiate_kerberos_auth_test.cc index 89532596ab..c1f640a788 100644 --- a/src/auth/negotiate/kerberos/negotiate_kerberos_auth_test.cc +++ b/src/auth/negotiate/kerberos/negotiate_kerberos_auth_test.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc b/src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc index b81874930e..4df0ad2f9f 100644 --- a/src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc +++ b/src/auth/negotiate/kerberos/negotiate_kerberos_pac.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/kerberos/required.m4 b/src/auth/negotiate/kerberos/required.m4 index f3108e2dfe..c716864233 100755 --- a/src/auth/negotiate/kerberos/required.m4 +++ b/src/auth/negotiate/kerberos/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/kerberos/test_negotiate_auth.sh b/src/auth/negotiate/kerberos/test_negotiate_auth.sh index 01dd75e964..dc610b1de0 100755 --- a/src/auth/negotiate/kerberos/test_negotiate_auth.sh +++ b/src/auth/negotiate/kerberos/test_negotiate_auth.sh @@ -1,6 +1,6 @@ #!/bin/bash # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/wrapper/Makefile.am b/src/auth/negotiate/wrapper/Makefile.am index f2f6c8ad8c..c158ad007a 100644 --- a/src/auth/negotiate/wrapper/Makefile.am +++ b/src/auth/negotiate/wrapper/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/wrapper/negotiate_wrapper.cc b/src/auth/negotiate/wrapper/negotiate_wrapper.cc index 534b61a221..7f53e2ba61 100644 --- a/src/auth/negotiate/wrapper/negotiate_wrapper.cc +++ b/src/auth/negotiate/wrapper/negotiate_wrapper.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/negotiate/wrapper/required.m4 b/src/auth/negotiate/wrapper/required.m4 index f666158a8a..ad7ffbc3e9 100755 --- a/src/auth/negotiate/wrapper/required.m4 +++ b/src/auth/negotiate/wrapper/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/Config.cc b/src/auth/ntlm/Config.cc index 08ebb59a14..4ad5f68418 100644 --- a/src/auth/ntlm/Config.cc +++ b/src/auth/ntlm/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -125,11 +125,11 @@ bool Auth::Ntlm::Config::configured() const { if ((authenticateProgram != NULL) && (authenticateChildren.n_max != 0)) { - debugs(29, 9, HERE << "returning configured"); + debugs(29, 9, "returning configured"); return true; } - debugs(29, 9, HERE << "returning unconfigured"); + debugs(29, 9, "returning unconfigured"); return false; } @@ -147,7 +147,7 @@ Auth::Ntlm::Config::fixHeader(Auth::UserRequest::Pointer auth_user_request, Http /* New request, no user details */ if (auth_user_request == NULL) { - debugs(29, 9, HERE << "Sending type:" << hdrType << " header: 'NTLM'"); + debugs(29, 9, "Sending type:" << hdrType << " header: 'NTLM'"); httpHeaderPutStrf(&rep->header, hdrType, "NTLM"); if (!keep_alive) { @@ -175,13 +175,13 @@ Auth::Ntlm::Config::fixHeader(Auth::UserRequest::Pointer auth_user_request, Http case Auth::Unchecked: /* semantic change: do not drop the connection. * 2.5 implementation used to keep it open - Kinkie */ - debugs(29, 9, HERE << "Sending type:" << hdrType << " header: 'NTLM'"); + debugs(29, 9, "Sending type:" << hdrType << " header: 'NTLM'"); httpHeaderPutStrf(&rep->header, hdrType, "NTLM"); break; case Auth::Handshake: /* we're waiting for a response from the client. Pass it the blob */ - debugs(29, 9, HERE << "Sending type:" << hdrType << " header: 'NTLM " << ntlm_request->server_blob << "'"); + debugs(29, 9, "Sending type:" << hdrType << " header: 'NTLM " << ntlm_request->server_blob << "'"); httpHeaderPutStrf(&rep->header, hdrType, "NTLM %s", ntlm_request->server_blob); safe_free(ntlm_request->server_blob); break; @@ -217,7 +217,7 @@ Auth::Ntlm::Config::decode(char const *proxy_auth, const HttpRequest *, const ch auth_user_request->user()->BuildUserKey(proxy_auth, aRequestRealm); /* all we have to do is identify that it's NTLM - the helper does the rest */ - debugs(29, 9, HERE << "decode: NTLM authentication"); + debugs(29, 9, "decode: NTLM authentication"); return auth_user_request; } diff --git a/src/auth/ntlm/Config.h b/src/auth/ntlm/Config.h index 332a17732a..b98cf1d62f 100644 --- a/src/auth/ntlm/Config.h +++ b/src/auth/ntlm/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/Makefile.am b/src/auth/ntlm/Makefile.am index 9cde618f21..497fdd5656 100644 --- a/src/auth/ntlm/Makefile.am +++ b/src/auth/ntlm/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/SMB_LM/Makefile.am b/src/auth/ntlm/SMB_LM/Makefile.am index 97cabf6138..a122a6113d 100644 --- a/src/auth/ntlm/SMB_LM/Makefile.am +++ b/src/auth/ntlm/SMB_LM/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc b/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc index 7a38dc4d1b..e26d1e1059 100644 --- a/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc +++ b/src/auth/ntlm/SMB_LM/ntlm_smb_lm_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/SMB_LM/required.m4 b/src/auth/ntlm/SMB_LM/required.m4 index 9e39cee2b7..fe906bf405 100755 --- a/src/auth/ntlm/SMB_LM/required.m4 +++ b/src/auth/ntlm/SMB_LM/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/SSPI/Makefile.am b/src/auth/ntlm/SSPI/Makefile.am index f98db262ae..3dedf6b512 100644 --- a/src/auth/ntlm/SSPI/Makefile.am +++ b/src/auth/ntlm/SSPI/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/SSPI/ntlm_sspi_auth.8 b/src/auth/ntlm/SSPI/ntlm_sspi_auth.8 index fb3607020a..01f894b8fa 100644 --- a/src/auth/ntlm/SSPI/ntlm_sspi_auth.8 +++ b/src/auth/ntlm/SSPI/ntlm_sspi_auth.8 @@ -101,7 +101,7 @@ This manual was written by . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc b/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc index 8c77d13033..ebf8bb3a0c 100644 --- a/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc +++ b/src/auth/ntlm/SSPI/ntlm_sspi_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/SSPI/required.m4 b/src/auth/ntlm/SSPI/required.m4 index 1f1a3d54f1..d8055c2362 100755 --- a/src/auth/ntlm/SSPI/required.m4 +++ b/src/auth/ntlm/SSPI/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/Scheme.cc b/src/auth/ntlm/Scheme.cc index 03e8106ea2..ad5f931859 100644 --- a/src/auth/ntlm/Scheme.cc +++ b/src/auth/ntlm/Scheme.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/Scheme.h b/src/auth/ntlm/Scheme.h index a8e010c4d1..68638a3073 100644 --- a/src/auth/ntlm/Scheme.h +++ b/src/auth/ntlm/Scheme.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/User.cc b/src/auth/ntlm/User.cc index 6a61b4ef37..25db6a8f93 100644 --- a/src/auth/ntlm/User.cc +++ b/src/auth/ntlm/User.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -19,7 +19,7 @@ Auth::Ntlm::User::User(Auth::SchemeConfig *aConfig, const char *aRequestRealm) : Auth::Ntlm::User::~User() { - debugs(29, 5, HERE << "doing nothing to clear NTLM scheme data for '" << this << "'"); + debugs(29, 5, "doing nothing to clear NTLM scheme data for '" << this << "'"); } int32_t diff --git a/src/auth/ntlm/User.h b/src/auth/ntlm/User.h index 7efe1b6452..ce8cbf1714 100644 --- a/src/auth/ntlm/User.h +++ b/src/auth/ntlm/User.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/UserRequest.cc b/src/auth/ntlm/UserRequest.cc index 7a33cd4281..a41a48af25 100644 --- a/src/auth/ntlm/UserRequest.cc +++ b/src/auth/ntlm/UserRequest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -56,11 +56,11 @@ int Auth::Ntlm::UserRequest::authenticated() const { if (user() != NULL && user()->credentials() == Auth::Ok) { - debugs(29, 9, HERE << "user authenticated."); + debugs(29, 9, "user authenticated."); return 1; } - debugs(29, 9, HERE << "user not fully authenticated."); + debugs(29, 9, "user not fully authenticated."); return 0; } @@ -128,7 +128,7 @@ Auth::Ntlm::UserRequest::startHelperLookup(HttpRequest *, AccessLogEntry::Pointe return; } - debugs(29, 8, HERE << "credentials state is '" << user()->credentials() << "'"); + debugs(29, 8, "credentials state is '" << user()->credentials() << "'"); const char *keyExtras = helperRequestKeyExtras(request, al); int printResult = 0; @@ -171,7 +171,7 @@ Auth::Ntlm::UserRequest::releaseAuthServer() ntlmauthenticators->cancelReservation(reservationId); reservationId.clear(); } else - debugs(29, 6, HERE << "No NTLM auth server to release."); + debugs(29, 6, "No NTLM auth server to release."); } void @@ -192,7 +192,7 @@ Auth::Ntlm::UserRequest::authenticate(HttpRequest * aRequest, ConnStateData * co } if (server_blob) { - debugs(29, 2, HERE << "need to challenge client '" << server_blob << "'!"); + debugs(29, 2, "need to challenge client '" << server_blob << "'!"); return; } @@ -218,7 +218,7 @@ Auth::Ntlm::UserRequest::authenticate(HttpRequest * aRequest, ConnStateData * co case Auth::Unchecked: /* we've received a ntlm request. pass to a helper */ - debugs(29, 9, HERE << "auth state ntlm none. Received blob: '" << proxy_auth << "'"); + debugs(29, 9, "auth state ntlm none. Received blob: '" << proxy_auth << "'"); user()->credentials(Auth::Pending); safe_free(client_blob); client_blob=xstrdup(blob); @@ -229,7 +229,7 @@ Auth::Ntlm::UserRequest::authenticate(HttpRequest * aRequest, ConnStateData * co break; case Auth::Pending: - debugs(29, DBG_IMPORTANT, HERE << "need to ask helper"); + debugs(29, DBG_IMPORTANT, "need to ask helper"); break; case Auth::Handshake: @@ -249,7 +249,7 @@ Auth::Ntlm::UserRequest::authenticate(HttpRequest * aRequest, ConnStateData * co case Auth::Failed: /* we've failed somewhere in authentication */ - debugs(29, 9, HERE << "auth state ntlm failed. " << proxy_auth); + debugs(29, 9, "auth state ntlm failed. " << proxy_auth); break; } } @@ -302,7 +302,7 @@ Auth::Ntlm::UserRequest::HandleReply(void *data, const Helper::Reply &reply) lm_request->server_blob = xstrdup(serverBlob); auth_user_request->user()->credentials(Auth::Handshake); auth_user_request->setDenyMessage("Authentication in progress"); - debugs(29, 4, HERE << "Need to challenge the client with a server token: '" << serverBlob << "'"); + debugs(29, 4, "Need to challenge the client with a server token: '" << serverBlob << "'"); } else { auth_user_request->user()->credentials(Auth::Failed); auth_user_request->setDenyMessage("NTLM authentication requires a persistent connection"); @@ -324,9 +324,9 @@ Auth::Ntlm::UserRequest::HandleReply(void *data, const Helper::Reply &reply) safe_free(lm_request->server_blob); lm_request->releaseAuthServer(); - debugs(29, 4, HERE << "Successfully validated user via NTLM. Username '" << userLabel << "'"); + debugs(29, 4, "Successfully validated user via NTLM. Username '" << userLabel << "'"); /* connection is authenticated */ - debugs(29, 4, HERE << "authenticated user " << auth_user_request->user()->username()); + debugs(29, 4, "authenticated user " << auth_user_request->user()->username()); /* see if this is an existing user */ auto local_auth_user = lm_request->user(); auto cached_user = Auth::Ntlm::User::Cache()->lookup(auth_user_request->user()->userKey()); @@ -346,7 +346,7 @@ Auth::Ntlm::UserRequest::HandleReply(void *data, const Helper::Reply &reply) * existing user or a new user */ local_auth_user->expiretime = current_time.tv_sec; auth_user_request->user()->credentials(Auth::Ok); - debugs(29, 4, HERE << "Successfully validated user via NTLM. Username '" << auth_user_request->user()->username() << "'"); + debugs(29, 4, "Successfully validated user via NTLM. Username '" << auth_user_request->user()->username() << "'"); } break; diff --git a/src/auth/ntlm/UserRequest.h b/src/auth/ntlm/UserRequest.h index 13843d7032..3ad2a3fcad 100644 --- a/src/auth/ntlm/UserRequest.h +++ b/src/auth/ntlm/UserRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/fake/Makefile.am b/src/auth/ntlm/fake/Makefile.am index 40589f059d..6d7230aa64 100644 --- a/src/auth/ntlm/fake/Makefile.am +++ b/src/auth/ntlm/fake/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/fake/ntlm_fake_auth.cc b/src/auth/ntlm/fake/ntlm_fake_auth.cc index 3738c82525..d4cfba7920 100644 --- a/src/auth/ntlm/fake/ntlm_fake_auth.cc +++ b/src/auth/ntlm/fake/ntlm_fake_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/fake/ntlm_fake_auth.pl.in b/src/auth/ntlm/fake/ntlm_fake_auth.pl.in index ebc36caaf0..de3b88e92e 100755 --- a/src/auth/ntlm/fake/ntlm_fake_auth.pl.in +++ b/src/auth/ntlm/fake/ntlm_fake_auth.pl.in @@ -1,6 +1,6 @@ #!@PERL@ # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/fake/required.m4 b/src/auth/ntlm/fake/required.m4 index 19872bf5c8..62ba618cca 100755 --- a/src/auth/ntlm/fake/required.m4 +++ b/src/auth/ntlm/fake/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/ntlm/helpers.m4 b/src/auth/ntlm/helpers.m4 index 17473ec802..0c9934f45f 100644 --- a/src/auth/ntlm/helpers.m4 +++ b/src/auth/ntlm/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/auth/toUtf.cc b/src/auth/toUtf.cc index bb94c8a08c..0d4ffb8799 100644 --- a/src/auth/toUtf.cc +++ b/src/auth/toUtf.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/auth/toUtf.h b/src/auth/toUtf.h index bde1eff9e8..b0644aa9f5 100644 --- a/src/auth/toUtf.h +++ b/src/auth/toUtf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/AsyncCall.cc b/src/base/AsyncCall.cc index d816eb8448..41752080f7 100644 --- a/src/base/AsyncCall.cc +++ b/src/base/AsyncCall.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -38,7 +38,7 @@ AsyncCall::~AsyncCall() void AsyncCall::make() { - debugs(debugSection, debugLevel, HERE << "make call " << name << + debugs(debugSection, debugLevel, "make call " << name << " [" << id << ']'); if (canFire()) { fire(); @@ -48,14 +48,14 @@ AsyncCall::make() if (!isCanceled) // we did not cancel() when returning false from canFire() isCanceled = "unknown reason"; - debugs(debugSection, debugLevel, HERE << "will not call " << name << + debugs(debugSection, debugLevel, "will not call " << name << " [" << id << ']' << " because of " << isCanceled); } bool AsyncCall::cancel(const char *reason) { - debugs(debugSection, debugLevel, HERE << "will not call " << name << + debugs(debugSection, debugLevel, "will not call " << name << " [" << id << "] " << (isCanceled ? "also " : "") << "because " << reason); diff --git a/src/base/AsyncCall.h b/src/base/AsyncCall.h index 942887312e..1b3a32b027 100644 --- a/src/base/AsyncCall.h +++ b/src/base/AsyncCall.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/AsyncCallQueue.cc b/src/base/AsyncCallQueue.cc index 05435fa347..ef6dca425f 100644 --- a/src/base/AsyncCallQueue.cc +++ b/src/base/AsyncCallQueue.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/AsyncCallQueue.h b/src/base/AsyncCallQueue.h index 402cf4e500..6e13996da3 100644 --- a/src/base/AsyncCallQueue.h +++ b/src/base/AsyncCallQueue.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/AsyncCalls.dox b/src/base/AsyncCalls.dox index 18e0c22ab8..dceae34c28 100644 --- a/src/base/AsyncCalls.dox +++ b/src/base/AsyncCalls.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/AsyncCbdataCalls.h b/src/base/AsyncCbdataCalls.h index 7ec0395c43..7ed3cad807 100644 --- a/src/base/AsyncCbdataCalls.h +++ b/src/base/AsyncCbdataCalls.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/AsyncJob.cc b/src/base/AsyncJob.cc index 795f8d9fdd..24394f0f9c 100644 --- a/src/base/AsyncJob.cc +++ b/src/base/AsyncJob.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -104,7 +104,7 @@ bool AsyncJob::canBeCalled(AsyncCall &call) const if (inCall != NULL) { // This may happen when we have bugs or some module is not calling // us asynchronously (comm used to do that). - debugs(93, 5, HERE << inCall << " is in progress; " << + debugs(93, 5, inCall << " is in progress; " << call << " cannot reenter the job."); return call.cancel("reentrant job call"); } @@ -154,7 +154,7 @@ void AsyncJob::callEnd() delete this; // this is the only place where a started job is deleted // careful: this object does not exist any more - debugs(93, 6, HERE << *inCallSaved << " ended " << thisSaved); + debugs(93, 6, *inCallSaved << " ended " << thisSaved); return; } diff --git a/src/base/AsyncJob.h b/src/base/AsyncJob.h index b0e4abf4dd..a46e300713 100644 --- a/src/base/AsyncJob.h +++ b/src/base/AsyncJob.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/AsyncJobCalls.h b/src/base/AsyncJobCalls.h index bb7568523e..70fd731ddc 100644 --- a/src/base/AsyncJobCalls.h +++ b/src/base/AsyncJobCalls.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -175,7 +175,7 @@ JobDialer::dial(AsyncCall &call) doDial(); } catch (const std::exception &e) { debugs(call.debugSection, 3, - HERE << call.name << " threw exception: " << e.what()); + call.name << " threw exception: " << e.what()); job->callException(e); } diff --git a/src/base/AsyncJobs.dox b/src/base/AsyncJobs.dox index 1437c22bba..d8f4794b1a 100644 --- a/src/base/AsyncJobs.dox +++ b/src/base/AsyncJobs.dox @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/ByteCounter.h b/src/base/ByteCounter.h index 1bd42f3d03..2b026a0f32 100644 --- a/src/base/ByteCounter.h +++ b/src/base/ByteCounter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/CbDataList.h b/src/base/CbDataList.h index 170d683e89..7388ee897c 100644 --- a/src/base/CbDataList.h +++ b/src/base/CbDataList.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/CbcPointer.h b/src/base/CbcPointer.h index d6a3d0cc1b..fd4f2e8f7c 100644 --- a/src/base/CbcPointer.h +++ b/src/base/CbcPointer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/CharacterSet.cc b/src/base/CharacterSet.cc index 99c4d22d1d..c664055f4b 100644 --- a/src/base/CharacterSet.cc +++ b/src/base/CharacterSet.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/CharacterSet.h b/src/base/CharacterSet.h index 008b44774d..d432758c42 100644 --- a/src/base/CharacterSet.h +++ b/src/base/CharacterSet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/ClpMap.h b/src/base/ClpMap.h index 12be45cad6..6a78375350 100644 --- a/src/base/ClpMap.h +++ b/src/base/ClpMap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/CodeContext.cc b/src/base/CodeContext.cc index aa6d69357c..68205c0023 100644 --- a/src/base/CodeContext.cc +++ b/src/base/CodeContext.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/CodeContext.h b/src/base/CodeContext.h index f56f6f3fbb..91d60b1754 100644 --- a/src/base/CodeContext.h +++ b/src/base/CodeContext.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/EnumIterator.h b/src/base/EnumIterator.h index 9aff18cccf..5d88100c45 100644 --- a/src/base/EnumIterator.h +++ b/src/base/EnumIterator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/File.cc b/src/base/File.cc index dce6d9de82..458ca560eb 100644 --- a/src/base/File.cc +++ b/src/base/File.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/File.h b/src/base/File.h index 31ae87d8e6..c8ee49b2d6 100644 --- a/src/base/File.h +++ b/src/base/File.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/HardFun.h b/src/base/HardFun.h index 8e1577048c..df36f6df63 100644 --- a/src/base/HardFun.h +++ b/src/base/HardFun.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/Here.cc b/src/base/Here.cc index 0a76156ffc..0879cbc402 100644 --- a/src/base/Here.cc +++ b/src/base/Here.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/Here.h b/src/base/Here.h index 18b5ce7fe0..295179ad6c 100644 --- a/src/base/Here.h +++ b/src/base/Here.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/InstanceId.cc b/src/base/InstanceId.cc index 9c79df3fe7..ac1e0e9431 100644 --- a/src/base/InstanceId.cc +++ b/src/base/InstanceId.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/InstanceId.h b/src/base/InstanceId.h index 7e4f593c08..4ea664daa2 100644 --- a/src/base/InstanceId.h +++ b/src/base/InstanceId.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/JobWait.cc b/src/base/JobWait.cc index ba68324157..67214a1855 100644 --- a/src/base/JobWait.cc +++ b/src/base/JobWait.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2020 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/JobWait.h b/src/base/JobWait.h index 6b11313319..9dc9263987 100644 --- a/src/base/JobWait.h +++ b/src/base/JobWait.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/Lock.h b/src/base/Lock.h index 7daf59a58f..d86d7f0594 100644 --- a/src/base/Lock.h +++ b/src/base/Lock.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/LookupTable.h b/src/base/LookupTable.h index 14440f881d..174214b991 100644 --- a/src/base/LookupTable.h +++ b/src/base/LookupTable.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/Makefile.am b/src/base/Makefile.am index db47706c54..b8476c18e1 100644 --- a/src/base/Makefile.am +++ b/src/base/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/base/Optional.h b/src/base/Optional.h index 13b8dc61dc..27b9b29457 100644 --- a/src/base/Optional.h +++ b/src/base/Optional.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/Packable.h b/src/base/Packable.h index 10ce50d592..0f25434e74 100644 --- a/src/base/Packable.h +++ b/src/base/Packable.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/PackableStream.h b/src/base/PackableStream.h index 080768c55b..867a3f7606 100644 --- a/src/base/PackableStream.h +++ b/src/base/PackableStream.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/Range.h b/src/base/Range.h index 9fb0a8a0ba..31cf9ee278 100644 --- a/src/base/Range.h +++ b/src/base/Range.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/RefCount.h b/src/base/RefCount.h index 0df5b190a7..ad8485f576 100644 --- a/src/base/RefCount.h +++ b/src/base/RefCount.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/RegexPattern.cc b/src/base/RegexPattern.cc index d00680ac2f..e0ec4cb8ed 100644 --- a/src/base/RegexPattern.cc +++ b/src/base/RegexPattern.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/RegexPattern.h b/src/base/RegexPattern.h index 597de0bc6e..b5b702dc2c 100644 --- a/src/base/RegexPattern.h +++ b/src/base/RegexPattern.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/RunnersRegistry.cc b/src/base/RunnersRegistry.cc index 5983430921..f7a86be5ce 100644 --- a/src/base/RunnersRegistry.cc +++ b/src/base/RunnersRegistry.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/RunnersRegistry.h b/src/base/RunnersRegistry.h index 47cef74c0d..896bd88738 100644 --- a/src/base/RunnersRegistry.h +++ b/src/base/RunnersRegistry.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/Subscription.h b/src/base/Subscription.h index 2ac1c47bc5..efffb04142 100644 --- a/src/base/Subscription.h +++ b/src/base/Subscription.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/TextException.cc b/src/base/TextException.cc index 6c6c54a227..dcd8e3ca9a 100644 --- a/src/base/TextException.cc +++ b/src/base/TextException.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/TextException.h b/src/base/TextException.h index e8573390a8..307923909b 100644 --- a/src/base/TextException.h +++ b/src/base/TextException.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/TypeTraits.h b/src/base/TypeTraits.h index a1b0fc7f5f..c9f02049b7 100644 --- a/src/base/TypeTraits.h +++ b/src/base/TypeTraits.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/YesNoNone.h b/src/base/YesNoNone.h index 6208cd1dda..5fb02ab676 100644 --- a/src/base/YesNoNone.h +++ b/src/base/YesNoNone.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/base/forward.h b/src/base/forward.h index 085c0d9d59..3e95d99e69 100644 --- a/src/base/forward.h +++ b/src/base/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/cache_cf.cc b/src/cache_cf.cc index e14d81c8a3..4250c0c0eb 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -599,7 +599,7 @@ parseConfigFileOrThrow(const char *file_name) { int err_count = 0; - debugs(5, 4, HERE); + debugs(5, 4, MYNAME); configFreeMemory(); diff --git a/src/cache_cf.h b/src/cache_cf.h index b280f2b3a0..9259c625fd 100644 --- a/src/cache_cf.h +++ b/src/cache_cf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/cache_manager.cc b/src/cache_manager.cc index 602b8fb8b0..fe2fb6bbf4 100644 --- a/src/cache_manager.cc +++ b/src/cache_manager.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -67,9 +67,9 @@ CacheManager::registerProfile(const Mgr::ActionProfile::Pointer &profile) Must(profile != NULL); if (!CacheManager::findAction(profile->name)) { menu_.push_back(profile); - debugs(16, 3, HERE << "registered profile: " << *profile); + debugs(16, 3, "registered profile: " << *profile); } else { - debugs(16, 2, HERE << "skipped duplicate profile: " << *profile); + debugs(16, 2, "skipped duplicate profile: " << *profile); } } @@ -82,7 +82,7 @@ CacheManager::registerProfile(const Mgr::ActionProfile::Pointer &profile) void CacheManager::registerProfile(char const * action, char const * desc, OBJH * handler, int pw_req_flag, int atomic) { - debugs(16, 3, HERE << "registering legacy " << action); + debugs(16, 3, "registering legacy " << action); const Mgr::ActionProfile::Pointer profile = new Mgr::ActionProfile(action, desc, pw_req_flag, atomic, new Mgr::FunActionCreator(handler)); registerProfile(profile); diff --git a/src/carp.cc b/src/carp.cc index b9f8705029..709b167b86 100644 --- a/src/carp.cc +++ b/src/carp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/carp.h b/src/carp.h index 793e629dc2..f7c6a99b42 100644 --- a/src/carp.h +++ b/src/carp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/cbdata.cc b/src/cbdata.cc index 9c2be617de..7c6ab992de 100644 --- a/src/cbdata.cc +++ b/src/cbdata.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/cbdata.h b/src/cbdata.h index 710441afaf..3c3d5d92ec 100644 --- a/src/cbdata.h +++ b/src/cbdata.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/cf.data.depend b/src/cf.data.depend index ffda0e0de4..6f8bf99723 100644 --- a/src/cf.data.depend +++ b/src/cf.data.depend @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/cf.data.pre b/src/cf.data.pre index 35ac847a0a..17acbb425d 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/cf.data.sed b/src/cf.data.sed index e7f515a6b1..1c529469ba 100644 --- a/src/cf.data.sed +++ b/src/cf.data.sed @@ -1,4 +1,4 @@ -# Copyright (C) 1996-2021 The Squid Software Foundation and contributors +# Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/cf_gen.cc b/src/cf_gen.cc index 483a05f038..58396c921b 100644 --- a/src/cf_gen.cc +++ b/src/cf_gen.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -670,7 +670,7 @@ gen_dump(const EntryList &head, std::ostream &fout) "static void" << std::endl << "dump_config(StoreEntry *entry)" << std::endl << "{" << std::endl << - " debugs(5, 4, HERE);" << std::endl; + " debugs(5, 4, MYNAME);" << std::endl; for (const auto &e : head) { @@ -702,7 +702,7 @@ gen_free(const EntryList &head, std::ostream &fout) "static void" << std::endl << "free_all(void)" << std::endl << "{" << std::endl << - " debugs(5, 4, HERE);" << std::endl; + " debugs(5, 4, MYNAME);" << std::endl; for (const auto &e : head) { if (!e.loc.size() || e.loc.compare("none") == 0) diff --git a/src/cf_gen_defines b/src/cf_gen_defines index a41d3d645f..36d27a5306 100644 --- a/src/cf_gen_defines +++ b/src/cf_gen_defines @@ -1,6 +1,6 @@ #!/usr/bin/awk -f -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -10,7 +10,7 @@ BEGIN { print "/* Generated automatically from cf.data.pre DO NOT EDIT */" print "/*" - print " * Copyright (C) 1996-2021 The Squid Software Foundation and contributors" + print " * Copyright (C) 1996-2022 The Squid Software Foundation and contributors" print " *" print " * Squid software is distributed under GPLv2+ license and includes" print " * contributions from numerous individuals and organizations." diff --git a/src/clientStream.cc b/src/clientStream.cc index 5c4623e734..bc1ca5686f 100644 --- a/src/clientStream.cc +++ b/src/clientStream.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clientStream.h b/src/clientStream.h index 3ed6c64446..bd04a004b6 100644 --- a/src/clientStream.h +++ b/src/clientStream.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clientStreamForward.h b/src/clientStreamForward.h index 096c114fd7..13feaf753c 100644 --- a/src/clientStreamForward.h +++ b/src/clientStreamForward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/client_db.cc b/src/client_db.cc index a8b11d4c20..a8bf0a7b22 100644 --- a/src/client_db.cc +++ b/src/client_db.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -456,7 +456,7 @@ snmp_meshCtblFn(variable_list * Var, snint * ErrP) *ErrP = SNMP_ERR_NOERROR; MemBuf tmp; - debugs(49, 6, HERE << "Current : length=" << Var->name_length << ": " << snmpDebugOid(Var->name, Var->name_length, tmp)); + debugs(49, 6, "Current : length=" << Var->name_length << ": " << snmpDebugOid(Var->name, Var->name_length, tmp)); if (Var->name_length == 16) { oid2addr(&(Var->name[12]), keyIp, 4); } else if (Var->name_length == 28) { @@ -467,11 +467,11 @@ snmp_meshCtblFn(variable_list * Var, snint * ErrP) } keyIp.toStr(key, sizeof(key)); - debugs(49, 5, HERE << "[" << key << "] requested!"); + debugs(49, 5, "[" << key << "] requested!"); c = (ClientInfo *) hash_lookup(client_table, key); if (c == NULL) { - debugs(49, 5, HERE << "not found."); + debugs(49, 5, "not found."); *ErrP = SNMP_ERR_NOSUCHNAME; return NULL; } diff --git a/src/client_db.h b/src/client_db.h index 99389b34b9..2fe603998c 100644 --- a/src/client_db.h +++ b/src/client_db.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/client_side.cc b/src/client_side.cc index 74128cbcf3..f52b9a5aa0 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -606,7 +606,7 @@ ConnStateData::extendLifetime() void ConnStateData::swanSong() { - debugs(33, 2, HERE << clientConnection); + debugs(33, 2, clientConnection); flags.readMore = false; clientdbEstablished(clientConnection->remote, -1); /* decrement */ @@ -662,7 +662,7 @@ ConnStateData::isOpen() const ConnStateData::~ConnStateData() { - debugs(33, 3, HERE << clientConnection); + debugs(33, 3, clientConnection); if (isOpen()) debugs(33, DBG_IMPORTANT, "ERROR: Squid BUG: ConnStateData did not close " << clientConnection); @@ -872,7 +872,7 @@ clientSocketDetach(clientStreamNode * node, ClientHttpRequest * http) void ConnStateData::readNextRequest() { - debugs(33, 5, HERE << clientConnection << " reading next req"); + debugs(33, 5, clientConnection << " reading next req"); fd_note(clientConnection->fd, "Idle client: Waiting for next request"); /** @@ -887,7 +887,7 @@ ConnStateData::readNextRequest() static void ClientSocketContextPushDeferredIfNeeded(Http::StreamPointer deferredRequest, ConnStateData * conn) { - debugs(33, 2, HERE << conn->clientConnection << " Sending next"); + debugs(33, 2, conn->clientConnection << " Sending next"); /** If the client stream is waiting on a socket write to occur, then */ @@ -990,19 +990,19 @@ ConnStateData::kick() void ConnStateData::stopSending(const char *error) { - debugs(33, 4, HERE << "sending error (" << clientConnection << "): " << error << + debugs(33, 4, "sending error (" << clientConnection << "): " << error << "; old receiving error: " << (stoppedReceiving() ? stoppedReceiving_ : "none")); if (const char *oldError = stoppedSending()) { - debugs(33, 3, HERE << "already stopped sending: " << oldError); + debugs(33, 3, "already stopped sending: " << oldError); return; // nothing has changed as far as this connection is concerned } stoppedSending_ = error; if (!stoppedReceiving()) { if (const int64_t expecting = mayNeedToReadMoreBody()) { - debugs(33, 5, HERE << "must still read " << expecting << + debugs(33, 5, "must still read " << expecting << " request body bytes with " << inBuf.length() << " unused"); return; // wait for the request receiver to finish reading } @@ -1456,7 +1456,7 @@ ConnStateData::clientAfterReadingRequests() { // Were we expecting to read more request body from half-closed connection? if (mayNeedToReadMoreBody() && commIsHalfClosed(clientConnection->fd)) { - debugs(33, 3, HERE << "truncated body: closing half-closed " << clientConnection); + debugs(33, 3, "truncated body: closing half-closed " << clientConnection); clientConnection->close(); return; } @@ -1474,7 +1474,7 @@ ConnStateData::quitAfterError(HttpRequest *request) if (request) request->flags.proxyKeepalive = false; flags.readMore = false; - debugs(33,4, HERE << "Will close after error: " << clientConnection); + debugs(33,4, "Will close after error: " << clientConnection); } #if USE_OPENSSL @@ -1593,7 +1593,7 @@ clientProcessRequestFinished(ConnStateData *conn, const HttpRequest::Pointer &re * be freed before accessing. */ if (request != NULL && request->flags.resetTcp && Comm::IsConnOpen(conn->clientConnection)) { - debugs(33, 3, HERE << "Sending TCP RST on " << conn->clientConnection); + debugs(33, 3, "Sending TCP RST on " << conn->clientConnection); conn->flags.readMore = false; comm_reset_close(conn->clientConnection); } @@ -1890,7 +1890,7 @@ ConnStateData::clientParseRequests() { bool parsed_req = false; - debugs(33, 5, HERE << clientConnection << ": attempting to parse"); + debugs(33, 5, clientConnection << ": attempting to parse"); // Loop while we have read bytes that are not needed for producing the body // On errors, bodyPipe may become nil, but readMore will be cleared @@ -1937,7 +1937,7 @@ ConnStateData::clientParseRequests() parsed_req = true; // XXX: do we really need to parse everything right NOW ? if (context->mayUseConnection()) { - debugs(33, 3, HERE << "Not parsing new requests, as this request may need the connection"); + debugs(33, 3, "Not parsing new requests, as this request may need the connection"); break; } } else { @@ -2018,7 +2018,7 @@ ConnStateData::handleRequestBodyData() return false; } } else { // identity encoding - debugs(33,5, HERE << "handling plain request body for " << clientConnection); + debugs(33,5, "handling plain request body for " << clientConnection); const size_t putSize = bodyPipe->putMoreData(inBuf.c_str(), inBuf.length()); if (putSize > 0) consumeInput(putSize); @@ -2030,13 +2030,13 @@ ConnStateData::handleRequestBodyData() } if (!bodyPipe) { - debugs(33,5, HERE << "produced entire request body for " << clientConnection); + debugs(33,5, "produced entire request body for " << clientConnection); if (const char *reason = stoppedSending()) { /* we've finished reading like good clients, * now do the close that initiateClose initiated. */ - debugs(33, 3, HERE << "closing for earlier sending error: " << reason); + debugs(33, 3, "closing for earlier sending error: " << reason); clientConnection->close(); return false; } @@ -2078,11 +2078,11 @@ ConnStateData::handleChunkedRequestBody() // if parser needs more space and we can consume nothing, we will stall Must(!bodyParser->needsMoreSpace() || bodyPipe->buf().hasContent()); } catch (...) { // TODO: be more specific - debugs(33, 3, HERE << "malformed chunks" << bodyPipe->status()); + debugs(33, 3, "malformed chunks" << bodyPipe->status()); return ERR_INVALID_REQ; } - debugs(33, 7, HERE << "need more chunked data" << *bodyPipe->status()); + debugs(33, 7, "need more chunked data" << *bodyPipe->status()); return ERR_NONE; } @@ -2115,7 +2115,7 @@ ConnStateData::abortChunkedRequestBody(const err_type error) comm_reset_close(clientConnection); } #else - debugs(33, 3, HERE << "aborting chunked request without error " << error); + debugs(33, 3, "aborting chunked request without error " << error); comm_reset_close(clientConnection); #endif flags.readMore = false; @@ -2273,7 +2273,7 @@ ConnStateData::whenClientIpKnown() cli->setWriteLimiter(pools[pool]->rate, burst, pools[pool]->highwatermark); break; } else { - debugs(83, 4, HERE << "Delay pool " << pool << " skipped because ACL " << answer); + debugs(83, 4, "Delay pool " << pool << " skipped because ACL " << answer); } } } @@ -2515,7 +2515,7 @@ httpsAccept(const CommAcceptCbParams ¶ms) return; } - debugs(33, 4, HERE << params.conn << " accepted, starting SSL negotiation."); + debugs(33, 4, params.conn << " accepted, starting SSL negotiation."); fd_note(params.conn->fd, "client https connect"); // Socket is ready, setup the connection manager to start using it @@ -2597,7 +2597,7 @@ ConnStateData::sslCrtdHandleReply(const Helper::Reply &reply) if (reply.result == Helper::BrokenHelper) { debugs(33, 5, "Certificate for " << tlsConnectHostOrIp << " cannot be generated. ssl_crtd response: " << reply); } else if (!reply.other().hasContent()) { - debugs(1, DBG_IMPORTANT, HERE << "\"ssl_crtd\" helper returned reply."); + debugs(1, DBG_IMPORTANT, "\"ssl_crtd\" helper returned reply."); } else { Ssl::CrtdMessage reply_message(Ssl::CrtdMessage::REPLY); if (reply_message.parse(reply.other().content(), reply.other().contentSize()) != Ssl::CrtdMessage::OK) { @@ -2665,7 +2665,7 @@ void ConnStateData::buildSslCertGenerationParams(Ssl::CertificateProperties &cer else if (ca->alg == Ssl::algSetValidBefore) certProperties.setValidBefore = true; - debugs(33, 5, HERE << "Matches certificate adaptation aglorithm: " << + debugs(33, 5, "Matches certificate adaptation aglorithm: " << alg << " param: " << (param ? param : "-")); } } @@ -2755,11 +2755,11 @@ ConnStateData::getSslContextStart() #if USE_SSL_CRTD try { - debugs(33, 5, HERE << "Generating SSL certificate for " << certProperties.commonName << " using ssl_crtd."); + debugs(33, 5, "Generating SSL certificate for " << certProperties.commonName << " using ssl_crtd."); Ssl::CrtdMessage request_message(Ssl::CrtdMessage::REQUEST); request_message.setCode(Ssl::CrtdMessage::code_new_certificate); request_message.composeRequest(certProperties); - debugs(33, 5, HERE << "SSL crtd request: " << request_message.compose().c_str()); + debugs(33, 5, "SSL crtd request: " << request_message.compose().c_str()); Ssl::Helper::Submit(request_message, sslCrtdHandleReplyWrapper, this); return; } catch (const std::exception &e) { @@ -2771,7 +2771,7 @@ ConnStateData::getSslContextStart() } #endif // USE_SSL_CRTD - debugs(33, 5, HERE << "Generating SSL certificate for " << certProperties.commonName); + debugs(33, 5, "Generating SSL certificate for " << certProperties.commonName); if (sslServerBump && (sslServerBump->act.step1 == Ssl::bumpPeek || sslServerBump->act.step1 == Ssl::bumpStare)) { doPeekAndSpliceStep(); auto ssl = fd_table[clientConnection->fd].ssl.get(); @@ -3636,19 +3636,19 @@ ConnStateData::mayNeedToReadMoreBody() const void ConnStateData::stopReceiving(const char *error) { - debugs(33, 4, HERE << "receiving error (" << clientConnection << "): " << error << + debugs(33, 4, "receiving error (" << clientConnection << "): " << error << "; old sending error: " << (stoppedSending() ? stoppedSending_ : "none")); if (const char *oldError = stoppedReceiving()) { - debugs(33, 3, HERE << "already stopped receiving: " << oldError); + debugs(33, 3, "already stopped receiving: " << oldError); return; // nothing has changed as far as this connection is concerned } stoppedReceiving_ = error; if (const char *sendError = stoppedSending()) { - debugs(33, 3, HERE << "closing because also stopped sending: " << sendError); + debugs(33, 3, "closing because also stopped sending: " << sendError); clientConnection->close(); } } @@ -3657,7 +3657,7 @@ void ConnStateData::expectNoForwarding() { if (bodyPipe != NULL) { - debugs(33, 4, HERE << "no consumer for virgin body " << bodyPipe->status()); + debugs(33, 4, "no consumer for virgin body " << bodyPipe->status()); bodyPipe->expectNoConsumption(); } } @@ -3667,7 +3667,7 @@ void ConnStateData::startDechunkingRequest() { Must(bodyPipe != NULL); - debugs(33, 5, HERE << "start dechunking" << bodyPipe->status()); + debugs(33, 5, "start dechunking" << bodyPipe->status()); assert(!bodyParser); bodyParser = new Http1::TeChunkedParser; } @@ -3676,10 +3676,10 @@ ConnStateData::startDechunkingRequest() void ConnStateData::finishDechunkingRequest(bool withSuccess) { - debugs(33, 5, HERE << "finish dechunking: " << withSuccess); + debugs(33, 5, "finish dechunking: " << withSuccess); if (bodyPipe != NULL) { - debugs(33, 7, HERE << "dechunked tail: " << bodyPipe->status()); + debugs(33, 7, "dechunked tail: " << bodyPipe->status()); BodyPipe::Pointer myPipe = bodyPipe; stopProducingFor(bodyPipe, withSuccess); // sets bodyPipe->bodySize() Must(!bodyPipe); // we rely on it being nil after we are done with body @@ -3705,7 +3705,7 @@ ConnStateData::sendControlMsg(HttpControlMsg msg) } if (!isOpen()) { - debugs(33, 3, HERE << "ignoring 1xx due to earlier closure"); + debugs(33, 3, "ignoring 1xx due to earlier closure"); return; } @@ -3726,7 +3726,7 @@ ConnStateData::sendControlMsg(HttpControlMsg msg) return; } - debugs(33, 3, HERE << " closing due to missing context for 1xx"); + debugs(33, 3, " closing due to missing context for 1xx"); clientConnection->close(); } @@ -3794,7 +3794,7 @@ ConnStateData::pinConnection(const Comm::ConnectionPointer &pinServer, const Htt pinning.serverConnection = pinServer; - debugs(33, 3, HERE << pinning.serverConnection); + debugs(33, 3, pinning.serverConnection); Must(pinning.serverConnection != NULL); @@ -3964,7 +3964,7 @@ ConnStateData::BorrowPinnedConnection(HttpRequest *request, const AccessLogEntry void ConnStateData::unpinConnection(const bool andClose) { - debugs(33, 3, HERE << pinning.serverConnection); + debugs(33, 3, pinning.serverConnection); if (pinning.peer) cbdataReferenceDone(pinning.peer); diff --git a/src/client_side.h b/src/client_side.h index b6b9133bf3..891fbd2069 100644 --- a/src/client_side.h +++ b/src/client_side.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index eaa49fbf4f..94edd1604f 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -1077,7 +1077,7 @@ clientReplyContext::storeOKTransferDone() const assert(http->storeEntry()->objectLen() >= 0); assert(http->storeEntry()->objectLen() >= headers_sz); if (http->out.offset >= http->storeEntry()->objectLen() - headers_sz) { - debugs(88,3,HERE << "storeOKTransferDone " << + debugs(88,3, "storeOKTransferDone " << " out.offset=" << http->out.offset << " objectLen()=" << http->storeEntry()->objectLen() << " headers_sz=" << headers_sz); @@ -1124,7 +1124,7 @@ clientReplyContext::storeNotOKTransferDone() const if (http->out.size < expectedLength) return 0; else { - debugs(88,3,HERE << "storeNotOKTransferDone " << + debugs(88,3, "storeNotOKTransferDone " << " out.size=" << http->out.size << " expectedLength=" << expectedLength); return 1; diff --git a/src/client_side_reply.h b/src/client_side_reply.h index 67d913df6e..8548b4b702 100644 --- a/src/client_side_reply.h +++ b/src/client_side_reply.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/client_side_request.cc b/src/client_side_request.cc index 47dd7ac594..09ae8ba42f 100644 --- a/src/client_side_request.cc +++ b/src/client_side_request.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -529,7 +529,7 @@ ClientRequestContext::hostHeaderIpVerify(const ipcache_addrs* ia, const Dns::Loo http->doCallouts(); return; } - debugs(85, 3, HERE << "FAIL: validate IP " << clientConn->local << " possible from Host:"); + debugs(85, 3, "FAIL: validate IP " << clientConn->local << " possible from Host:"); hostHeaderVerifyFailed("local IP", "any domain IP"); } @@ -586,7 +586,7 @@ ClientRequestContext::hostHeaderVerify() if (!host) { // TODO: dump out the HTTP/1.1 error about missing host header. // otherwise this is fine, can't forge a header value when its not even set. - debugs(85, 3, HERE << "validate skipped with no Host: header present."); + debugs(85, 3, "validate skipped with no Host: header present."); http->doCallouts(); return; } @@ -594,7 +594,7 @@ ClientRequestContext::hostHeaderVerify() if (http->request->flags.internal) { // TODO: kill this when URL handling allows partial URLs out of accel mode // and we no longer screw with the URL just to add our internal host there - debugs(85, 6, HERE << "validate skipped due to internal composite URL."); + debugs(85, 6, "validate skipped due to internal composite URL."); http->doCallouts(); return; } @@ -715,7 +715,7 @@ ClientRequestContext::clientAccessCheck2() acl_checklist = clientAclChecklistCreate(Config.accessList.adapted_http, http); acl_checklist->nonBlockingCheck(clientAccessCheckDoneWrapper, this); } else { - debugs(85, 2, HERE << "No adapted_http_access configuration. default: ALLOW"); + debugs(85, 2, "No adapted_http_access configuration. default: ALLOW"); clientAccessCheckDone(ACCESS_ALLOWED); } } @@ -818,7 +818,7 @@ ClientRequestContext::clientAccessCheckDone(const Acl::Answer &answer) void ClientHttpRequest::noteAdaptationAclCheckDone(Adaptation::ServiceGroupPointer g) { - debugs(93,3,HERE << this << " adaptationAclCheckDone called"); + debugs(93,3, this << " adaptationAclCheckDone called"); #if ICAP_CLIENT Adaptation::Icap::History::Pointer ih = request->icapHistory(); @@ -837,7 +837,7 @@ ClientHttpRequest::noteAdaptationAclCheckDone(Adaptation::ServiceGroupPointer g) #endif if (!g) { - debugs(85,3, HERE << "no adaptation needed"); + debugs(85,3, "no adaptation needed"); doCallouts(); return; } @@ -865,7 +865,7 @@ clientRedirectAccessCheckDone(Acl::Answer answer, void *data) void ClientRequestContext::clientRedirectStart() { - debugs(33, 5, HERE << "'" << http->uri << "'"); + debugs(33, 5, "'" << http->uri << "'"); http->al->syncNotes(http->request); if (Config.accessList.redirector) { acl_checklist = clientAclChecklistCreate(Config.accessList.redirector, http); @@ -1180,7 +1180,7 @@ void ClientRequestContext::clientRedirectDone(const Helper::Reply &reply) { HttpRequest *old_request = http->request; - debugs(85, 5, HERE << "'" << http->uri << "' result=" << reply); + debugs(85, 5, "'" << http->uri << "' result=" << reply); assert(redirect_state == REDIRECT_PENDING); redirect_state = REDIRECT_DONE; @@ -1266,7 +1266,7 @@ ClientRequestContext::clientRedirectDone(const Helper::Reply &reply) // unlink bodypipe from the old request. Not needed there any longer. if (old_request->body_pipe != NULL) { old_request->body_pipe = NULL; - debugs(61,2, HERE << "URL-rewriter diverts body_pipe " << new_request->body_pipe << + debugs(61,2, "URL-rewriter diverts body_pipe " << new_request->body_pipe << " from request " << old_request << " to " << new_request); } @@ -1401,7 +1401,7 @@ ClientRequestContext::sslBumpAccessCheck() // If SSL connection tunneling or bumping decision has been made, obey it. if (bumpMode != Ssl::bumpEnd) { - debugs(85, 5, HERE << "SslBump already decided (" << bumpMode << + debugs(85, 5, "SslBump already decided (" << bumpMode << "), " << "ignoring ssl_bump for " << http->getConn()); // We need the following "if" for transparently bumped TLS connection, @@ -1428,7 +1428,7 @@ ClientRequestContext::sslBumpAccessCheck() !Config.accessList.ssl_bump || !http->getConn()->port->flags.tunnelSslBumping) { http->al->ssl.bumpMode = Ssl::bumpEnd; // SslBump does not apply; log - - debugs(85, 5, HERE << "cannot SslBump this request"); + debugs(85, 5, "cannot SslBump this request"); return false; } @@ -1436,7 +1436,7 @@ ClientRequestContext::sslBumpAccessCheck() // if we delay a 407 response and respond with 200 OK to CONNECT. if (error && error->httpStatus == Http::scProxyAuthenticationRequired) { http->al->ssl.bumpMode = Ssl::bumpEnd; // SslBump does not apply; log - - debugs(85, 5, HERE << "no SslBump during proxy authentication"); + debugs(85, 5, "no SslBump during proxy authentication"); return false; } @@ -1447,7 +1447,7 @@ ClientRequestContext::sslBumpAccessCheck() return false; } - debugs(85, 5, HERE << "SslBump possible, checking ACL"); + debugs(85, 5, "SslBump possible, checking ACL"); ACLFilledChecklist *aclChecklist = clientAclChecklistCreate(Config.accessList.ssl_bump, http); aclChecklist->nonBlockingCheck(sslBumpAccessCheckDoneWrapper, this); @@ -1540,7 +1540,7 @@ ClientHttpRequest::httpStart() void ClientHttpRequest::sslBumpNeed(Ssl::BumpMode mode) { - debugs(83, 3, HERE << "sslBump required: "<< Ssl::bumpMode(mode)); + debugs(83, 3, "sslBump required: "<< Ssl::bumpMode(mode)); sslBumpNeed_ = mode; } @@ -1549,7 +1549,7 @@ static void SslBumpEstablish(const Comm::ConnectionPointer &, char *, size_t, Comm::Flag errflag, int, void *data) { ClientHttpRequest *r = static_cast(data); - debugs(85, 5, HERE << "responded to CONNECT: " << r << " ? " << errflag); + debugs(85, 5, "responded to CONNECT: " << r << " ? " << errflag); assert(r && cbdataReferenceValid(r)); r->sslBumpEstablish(errflag); @@ -1563,7 +1563,7 @@ ClientHttpRequest::sslBumpEstablish(Comm::Flag errflag) return; if (errflag) { - debugs(85, 3, HERE << "CONNECT response failure in SslBump: " << errflag); + debugs(85, 3, "CONNECT response failure in SslBump: " << errflag); getConn()->clientConnection->close(); return; } @@ -1581,7 +1581,7 @@ ClientHttpRequest::sslBumpEstablish(Comm::Flag errflag) void ClientHttpRequest::sslBumpStart() { - debugs(85, 5, HERE << "Confirming " << Ssl::bumpMode(sslBumpNeed_) << + debugs(85, 5, "Confirming " << Ssl::bumpMode(sslBumpNeed_) << "-bumped CONNECT tunnel on FD " << getConn()->clientConnection); getConn()->sslBumpMode = sslBumpNeed_; @@ -1734,14 +1734,14 @@ ClientHttpRequest::doCallouts() if (!calloutContext->error) { // CVE-2009-0801: verify the Host: header is consistent with other known details. if (!calloutContext->host_header_verify_done) { - debugs(83, 3, HERE << "Doing calloutContext->hostHeaderVerify()"); + debugs(83, 3, "Doing calloutContext->hostHeaderVerify()"); calloutContext->host_header_verify_done = true; calloutContext->hostHeaderVerify(); return; } if (!calloutContext->http_access_done) { - debugs(83, 3, HERE << "Doing calloutContext->clientAccessCheck()"); + debugs(83, 3, "Doing calloutContext->clientAccessCheck()"); calloutContext->http_access_done = true; calloutContext->clientAccessCheck(); return; @@ -1761,7 +1761,7 @@ ClientHttpRequest::doCallouts() calloutContext->redirect_done = true; if (Config.Program.redirect) { - debugs(83, 3, HERE << "Doing calloutContext->clientRedirectStart()"); + debugs(83, 3, "Doing calloutContext->clientRedirectStart()"); calloutContext->redirect_state = REDIRECT_PENDING; calloutContext->clientRedirectStart(); return; @@ -1769,7 +1769,7 @@ ClientHttpRequest::doCallouts() } if (!calloutContext->adapted_http_access_done) { - debugs(83, 3, HERE << "Doing calloutContext->clientAccessCheck2()"); + debugs(83, 3, "Doing calloutContext->clientAccessCheck2()"); calloutContext->adapted_http_access_done = true; calloutContext->clientAccessCheck2(); return; @@ -1787,7 +1787,7 @@ ClientHttpRequest::doCallouts() } if (!calloutContext->interpreted_req_hdrs) { - debugs(83, 3, HERE << "Doing clientInterpretRequestHeaders()"); + debugs(83, 3, "Doing clientInterpretRequestHeaders()"); calloutContext->interpreted_req_hdrs = 1; clientInterpretRequestHeaders(this); } @@ -1796,7 +1796,7 @@ ClientHttpRequest::doCallouts() calloutContext->no_cache_done = true; if (Config.accessList.noCache && request->flags.cachable) { - debugs(83, 3, HERE << "Doing calloutContext->checkNoCache()"); + debugs(83, 3, "Doing calloutContext->checkNoCache()"); calloutContext->checkNoCache(); return; } @@ -1881,7 +1881,7 @@ ClientHttpRequest::doCallouts() headersLog(0, 1, request->method, request); #endif - debugs(83, 3, HERE << "calling processRequest()"); + debugs(83, 3, "calling processRequest()"); processRequest(); #if ICAP_CLIENT @@ -1967,7 +1967,7 @@ ClientHttpRequest::prepPartialResponseGeneration() void ClientHttpRequest::startAdaptation(const Adaptation::ServiceGroupPointer &g) { - debugs(85, 3, HERE << "adaptation needed for " << this); + debugs(85, 3, "adaptation needed for " << this); assert(!virginHeadSource); assert(!adaptedBodySource); virginHeadSource = initiateAdaptation( @@ -2014,7 +2014,7 @@ ClientHttpRequest::handleAdaptedHeader(Http::Message *msg) resetRequest(new_req); assert(request->method.id()); } else if (HttpReply *new_rep = dynamic_cast(msg)) { - debugs(85,3,HERE << "REQMOD reply is HTTP reply"); + debugs(85,3, "REQMOD reply is HTTP reply"); // subscribe to receive reply body if (new_rep->body_pipe != NULL) { @@ -2121,7 +2121,7 @@ ClientHttpRequest::noteBodyProductionEnded(BodyPipe::Pointer) void ClientHttpRequest::endRequestSatisfaction() { - debugs(85,4, HERE << this << " ends request satisfaction"); + debugs(85,4, this << " ends request satisfaction"); assert(request_satisfaction_mode); stopConsumingFrom(adaptedBodySource); @@ -2142,7 +2142,7 @@ ClientHttpRequest::noteBodyProducerAborted(BodyPipe::Pointer) assert(!virginHeadSource); stopConsumingFrom(adaptedBodySource); - debugs(85,3, HERE << "REQMOD body production failed"); + debugs(85,3, "REQMOD body production failed"); if (request_satisfaction_mode) { // too late to recover or serve an error static const auto d = MakeNamedErrorDetail("CLT_REQMOD_RESP_BODY"); request->detailError(ERR_ICAP_FAILURE, d); @@ -2158,20 +2158,20 @@ ClientHttpRequest::noteBodyProducerAborted(BodyPipe::Pointer) void ClientHttpRequest::handleAdaptationFailure(const ErrorDetail::Pointer &errDetail, bool bypassable) { - debugs(85,3, HERE << "handleAdaptationFailure(" << bypassable << ")"); + debugs(85,3, "handleAdaptationFailure(" << bypassable << ")"); const bool usedStore = storeEntry() && !storeEntry()->isEmpty(); const bool usedPipe = request->body_pipe != NULL && request->body_pipe->consumedSize() > 0; if (bypassable && !usedStore && !usedPipe) { - debugs(85,3, HERE << "ICAP REQMOD callout failed, bypassing: " << calloutContext); + debugs(85,3, "ICAP REQMOD callout failed, bypassing: " << calloutContext); if (calloutContext) doCallouts(); return; } - debugs(85,3, HERE << "ICAP REQMOD callout failed, responding with error"); + debugs(85,3, "ICAP REQMOD callout failed, responding with error"); clientStreamNode *node = (clientStreamNode *)client_stream.tail->prev->data; clientReplyContext *repContext = dynamic_cast(node->data.getRaw()); diff --git a/src/client_side_request.h b/src/client_side_request.h index e2c3160e66..bb84835e97 100644 --- a/src/client_side_request.h +++ b/src/client_side_request.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clients/Client.cc b/src/clients/Client.cc index e42d3d3c2d..30ad799d6a 100644 --- a/src/clients/Client.cc +++ b/src/clients/Client.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -116,7 +116,7 @@ Client::virginReply() const HttpReply * Client::setVirginReply(HttpReply *rep) { - debugs(11,5, HERE << this << " setting virgin reply to " << rep); + debugs(11,5, this << " setting virgin reply to " << rep); assert(!theVirginReply); assert(rep); theVirginReply = rep; @@ -136,7 +136,7 @@ Client::finalReply() HttpReply * Client::setFinalReply(HttpReply *rep) { - debugs(11,5, HERE << this << " setting final reply to " << rep); + debugs(11,5, this << " setting final reply to " << rep); assert(!theFinalReply); assert(rep); @@ -180,7 +180,7 @@ Client::markParsedVirginReplyAsWhole(const char *reasonWeAreSure) void Client::serverComplete() { - debugs(11,5,HERE << "serverComplete " << this); + debugs(11,5, "serverComplete " << this); if (!doneWithServer()) { closeServer(); @@ -202,7 +202,7 @@ Client::serverComplete() void Client::serverComplete2() { - debugs(11,5,HERE << "serverComplete2 " << this); + debugs(11,5, "serverComplete2 " << this); #if USE_ADAPTATION if (virginBodyDestination != NULL) @@ -230,7 +230,7 @@ bool Client::doneAll() const void Client::completeForwarding() { - debugs(11,5, HERE << "completing forwarding for " << fwd); + debugs(11,5, "completing forwarding for " << fwd); assert(fwd != NULL); doneWithFwd = "completeForwarding()"; fwd->complete(); @@ -243,12 +243,12 @@ bool Client::startRequestBodyFlow() assert(r->body_pipe != NULL); requestBodySource = r->body_pipe; if (requestBodySource->setConsumerIfNotLate(this)) { - debugs(11,3, HERE << "expecting request body from " << + debugs(11,3, "expecting request body from " << requestBodySource->status()); return true; } - debugs(11,3, HERE << "aborting on partially consumed request body: " << + debugs(11,3, "aborting on partially consumed request body: " << requestBodySource->status()); requestBodySource = NULL; return false; @@ -261,7 +261,7 @@ Client::abortOnBadEntry(const char *abortReason) if (entry->isAccepting()) return false; - debugs(11,5, HERE << "entry is not Accepting!"); + debugs(11,5, "entry is not Accepting!"); abortOnData(abortReason); return true; } @@ -322,7 +322,7 @@ Client::handleMoreRequestBodyAvailable() if (!requestSender) sendMoreRequestBody(); else - debugs(9,3, HERE << "waiting for request body write to complete"); + debugs(9,3, "waiting for request body write to complete"); } // there will be no more handleMoreRequestBodyAvailable calls @@ -333,14 +333,14 @@ Client::handleRequestBodyProductionEnded() if (!requestSender) doneSendingRequestBody(); else - debugs(9,3, HERE << "waiting for request body write to complete"); + debugs(9,3, "waiting for request body write to complete"); } // called when we are done sending request body; kids extend this void Client::doneSendingRequestBody() { - debugs(9,3, HERE << "done sending request body"); + debugs(9,3, "done sending request body"); assert(requestBodySource != NULL); stopConsumingFrom(requestBodySource); @@ -352,7 +352,7 @@ void Client::handleRequestBodyProducerAborted() { if (requestSender != NULL) - debugs(9,3, HERE << "fyi: request body aborted while we were sending"); + debugs(9,3, "fyi: request body aborted while we were sending"); fwd->dontRetry(true); // the problem is not with the server stopConsumingFrom(requestBodySource); // requestSender, if any, will notice @@ -365,7 +365,7 @@ void Client::sentRequestBody(const CommIoCbParams &io) { debugs(11, 5, "sentRequestBody: FD " << io.fd << ": size " << io.size << ": errflag " << io.flag << "."); - debugs(32,3,HERE << "sentRequestBody called"); + debugs(32,3, "sentRequestBody called"); requestSender = NULL; @@ -379,7 +379,7 @@ Client::sentRequestBody(const CommIoCbParams &io) return; if (!requestBodySource) { - debugs(9,3, HERE << "detected while-we-were-sending abort"); + debugs(9,3, "detected while-we-were-sending abort"); return; // do nothing; } @@ -406,7 +406,7 @@ Client::sentRequestBody(const CommIoCbParams &io) else if (receivedWholeRequestBody) doneSendingRequestBody(); else - debugs(9,3, HERE << "waiting for body production end or abort"); + debugs(9,3, "waiting for body production end or abort"); } void @@ -418,18 +418,18 @@ Client::sendMoreRequestBody() const Comm::ConnectionPointer conn = dataConnection(); if (!Comm::IsConnOpen(conn)) { - debugs(9,3, HERE << "cannot send request body to closing " << conn); + debugs(9,3, "cannot send request body to closing " << conn); return; // wait for the kid's close handler; TODO: assert(closer); } MemBuf buf; if (getMoreRequestBody(buf) && buf.contentSize() > 0) { - debugs(9,3, HERE << "will write " << buf.contentSize() << " request body bytes"); + debugs(9,3, "will write " << buf.contentSize() << " request body bytes"); typedef CommCbMemFunT Dialer; requestSender = JobCallback(93,3, Dialer, this, Client::sentRequestBody); Comm::Write(conn, &buf, requestSender); } else { - debugs(9,3, HERE << "will wait for more request body bytes or eof"); + debugs(9,3, "will wait for more request body bytes or eof"); requestSender = NULL; } } @@ -588,7 +588,7 @@ Client::startAdaptation(const Adaptation::ServiceGroupPointer &group, HttpReques if (vrep->expectingBody(cause->method, size) && size) { virginBodyDestination = new BodyPipe(this); vrep->body_pipe = virginBodyDestination; - debugs(93, 6, HERE << "will send virgin reply body to " << + debugs(93, 6, "will send virgin reply body to " << virginBodyDestination << "; size: " << size); if (size > 0) virginBodyDestination->setBodySize(size); @@ -604,7 +604,7 @@ Client::startAdaptation(const Adaptation::ServiceGroupPointer &group, HttpReques // may be called multiple times void Client::cleanAdaptation() { - debugs(11,5, HERE << "cleaning ICAP; ACL: " << adaptationAccessCheckPending); + debugs(11,5, "cleaning ICAP; ACL: " << adaptationAccessCheckPending); if (virginBodyDestination != NULL) stopProducingFor(virginBodyDestination, false); @@ -632,7 +632,7 @@ Client::adaptVirginReplyBody(const char *data, ssize_t len) assert(startedAdaptation); if (!virginBodyDestination) { - debugs(11,3, HERE << "ICAP does not want more virgin body"); + debugs(11,3, "ICAP does not want more virgin body"); return; } @@ -731,7 +731,7 @@ Client::handleAdaptedHeader(Http::Message *msg) HttpReply *rep = dynamic_cast(msg); assert(rep); - debugs(11,5, HERE << this << " setting adapted reply to " << rep); + debugs(11,5, this << " setting adapted reply to " << rep); setFinalReply(rep); assert(!adaptedBodySource); @@ -789,18 +789,18 @@ Client::handleMoreAdaptedBodyAvailable() } if (!spaceAvailable) { - debugs(11, 5, HERE << "NOT storing " << contentSize << " bytes of adapted " << + debugs(11, 5, "NOT storing " << contentSize << " bytes of adapted " << "response body at offset " << adaptedBodySource->consumedSize()); return; } if (spaceAvailable < contentSize ) { - debugs(11, 5, HERE << "postponing storage of " << + debugs(11, 5, "postponing storage of " << (contentSize - spaceAvailable) << " body bytes"); contentSize = spaceAvailable; } - debugs(11,5, HERE << "storing " << contentSize << " bytes of adapted " << + debugs(11,5, "storing " << contentSize << " bytes of adapted " << "response body at offset " << adaptedBodySource->consumedSize()); BodyPipeCheckout bpc(*adaptedBodySource); @@ -866,7 +866,7 @@ void Client::handleAdaptedBodyProducerAborted() void Client::handleAdaptationCompleted() { - debugs(11,5, HERE << "handleAdaptationCompleted"); + debugs(11,5, "handleAdaptationCompleted"); cleanAdaptation(); // We stop reading origin response because we have no place to put it(*) and @@ -874,7 +874,7 @@ Client::handleAdaptationCompleted() // reuse more pconns, we can add code to discard unneeded origin responses. // (*) TODO: Is it possible that the adaptation xaction is still running? if (mayReadVirginReplyBody()) { - debugs(11,3, HERE << "closing origin conn due to ICAP completion"); + debugs(11,3, "closing origin conn due to ICAP completion"); closeServer(); } @@ -885,7 +885,7 @@ Client::handleAdaptationCompleted() void Client::handleAdaptationAborted(bool bypassable) { - debugs(11,5, HERE << "handleAdaptationAborted; bypassable: " << bypassable << + debugs(11,5, "handleAdaptationAborted; bypassable: " << bypassable << ", entry empty: " << entry->isEmpty()); if (abortOnBadEntry("entry went bad while ICAP aborted")) @@ -924,7 +924,7 @@ Client::handledEarlyAdaptationAbort() void Client::handleAdaptationBlocked(const Adaptation::Answer &answer) { - debugs(11,5, HERE << answer.ruleId); + debugs(11,5, answer.ruleId); if (abortOnBadEntry("entry went bad while ICAP aborted")) return; @@ -938,7 +938,7 @@ Client::handleAdaptationBlocked(const Adaptation::Answer &answer) return; } - debugs(11,7, HERE << "creating adaptation block response"); + debugs(11,7, "creating adaptation block response"); err_type page_id = aclGetDenyInfoPage(&Config.denyInfoList, answer.ruleId.termedBuf(), 1); @@ -971,7 +971,7 @@ Client::noteAdaptationAclCheckDone(Adaptation::ServiceGroupPointer group) // TODO: Should we check receivedBodyTooLarge as well? if (!group) { - debugs(11,3, HERE << "no adapation needed"); + debugs(11,3, "no adapation needed"); setFinalReply(virginReply()); processReplyBody(); return; @@ -1002,7 +1002,7 @@ Client::adaptOrFinalizeReply() adaptationAccessCheckPending = Adaptation::AccessCheck::Start( Adaptation::methodRespmod, Adaptation::pointPreCache, originalRequest().getRaw(), virginReply(), fwd->al, this); - debugs(11,5, HERE << "adaptationAccessCheckPending=" << adaptationAccessCheckPending); + debugs(11,5, "adaptationAccessCheckPending=" << adaptationAccessCheckPending); if (adaptationAccessCheckPending) return; #endif diff --git a/src/clients/Client.h b/src/clients/Client.h index d19cbe9aed..be79b395e4 100644 --- a/src/clients/Client.h +++ b/src/clients/Client.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clients/FtpClient.cc b/src/clients/FtpClient.cc index d48c744250..3442f793b0 100644 --- a/src/clients/FtpClient.cc +++ b/src/clients/FtpClient.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clients/FtpClient.h b/src/clients/FtpClient.h index 60d8b009d6..4b2dd61d54 100644 --- a/src/clients/FtpClient.h +++ b/src/clients/FtpClient.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clients/FtpGateway.cc b/src/clients/FtpGateway.cc index a3163eba16..ae18fe2c29 100644 --- a/src/clients/FtpGateway.cc +++ b/src/clients/FtpGateway.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -461,7 +461,7 @@ Ftp::Gateway::listenForDataChannel(const Comm::ConnectionPointer &conn) debugs(5, DBG_CRITICAL, "ERROR: comm_open_listener failed:" << conn->local << " error: " << errno); return; } - debugs(9, 3, HERE << "Unconnected data socket created on " << conn); + debugs(9, 3, "Unconnected data socket created on " << conn); } conn->tos = ctrl.conn->tos; @@ -882,7 +882,7 @@ Ftp::Gateway::parseListing() size_t len = data.readBuf->contentSize(); if (!len) { - debugs(9, 3, HERE << "no content to parse for " << entry->url() ); + debugs(9, 3, "no content to parse for " << entry->url() ); return; } @@ -898,21 +898,21 @@ Ftp::Gateway::parseListing() usable = end - sbuf; - debugs(9, 3, HERE << "usable = " << usable << " of " << len << " bytes."); + debugs(9, 3, "usable = " << usable << " of " << len << " bytes."); if (usable == 0) { if (buf[0] == '\0' && len == 1) { - debugs(9, 3, HERE << "NIL ends data from " << entry->url() << " transfer problem?"); + debugs(9, 3, "NIL ends data from " << entry->url() << " transfer problem?"); data.readBuf->consume(len); } else { - debugs(9, 3, HERE << "didn't find end for " << entry->url()); - debugs(9, 3, HERE << "buffer remains (" << len << " bytes) '" << rfc1738_do_escape(buf,0) << "'"); + debugs(9, 3, "didn't find end for " << entry->url()); + debugs(9, 3, "buffer remains (" << len << " bytes) '" << rfc1738_do_escape(buf,0) << "'"); } xfree(sbuf); return; } - debugs(9, 3, HERE << (unsigned long int)len << " bytes to play with"); + debugs(9, 3, (unsigned long int)len << " bytes to play with"); line = (char *)memAllocate(MEM_4K_BUF); ++end; @@ -920,7 +920,7 @@ Ftp::Gateway::parseListing() s += strspn(s, crlf); for (; s < end; s += strcspn(s, crlf), s += strspn(s, crlf)) { - debugs(9, 7, HERE << "s = {" << s << "}"); + debugs(9, 7, "s = {" << s << "}"); linelen = strcspn(s, crlf) + 1; if (linelen < 2) @@ -931,7 +931,7 @@ Ftp::Gateway::parseListing() xstrncpy(line, s, linelen); - debugs(9, 7, HERE << "{" << line << "}"); + debugs(9, 7, "{" << line << "}"); if (!strncmp(line, "total", 5)) continue; @@ -947,7 +947,7 @@ Ftp::Gateway::parseListing() } } - debugs(9, 7, HERE << "Done."); + debugs(9, 7, "Done."); data.readBuf->consume(usable); memFree(line, MEM_4K_BUF); xfree(sbuf); @@ -995,7 +995,7 @@ Ftp::Gateway::processReplyBody() return; } else if (const int csize = data.readBuf->contentSize()) { writeReplyBody(data.readBuf->content(), csize); - debugs(9, 5, HERE << "consuming " << csize << " bytes of readBuf"); + debugs(9, 5, "consuming " << csize << " bytes of readBuf"); data.readBuf->consume(csize); } @@ -1078,7 +1078,7 @@ Ftp::Gateway::checkUrlpath() const auto fullPath = request->url.path(); const auto typecodePos = typeSpecStart + middle.length(); typecode = (typecodePos < fullPath.length()) ? - static_cast(xtoupper(fullPath[typecodePos])) : '\0'; + static_cast(xtoupper(fullPath[typecodePos])) : '\0'; request->url.path(fullPath.substr(0, typeSpecStart)); } @@ -1183,7 +1183,7 @@ static void ftpReadWelcome(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (ftpState->flags.pasv_only) ++ ftpState->login_att; @@ -1292,7 +1292,7 @@ static void ftpReadUser(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code == 230) { ftpReadPass(ftpState); @@ -1319,7 +1319,7 @@ static void ftpReadPass(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE << "code=" << code); + debugs(9, 3, "code=" << code); if (code == 230) { ftpSendType(ftpState); @@ -1383,7 +1383,7 @@ ftpReadType(Ftp::Gateway * ftpState) int code = ftpState->ctrl.replycode; char *path; char *d, *p; - debugs(9, 3, HERE << "code=" << code); + debugs(9, 3, "code=" << code); if (code == 200) { p = path = SBufToCstring(ftpState->request->url.path()); @@ -1420,7 +1420,7 @@ ftpReadType(Ftp::Gateway * ftpState) static void ftpTraverseDirectory(Ftp::Gateway * ftpState) { - debugs(9, 4, HERE << (ftpState->filepath ? ftpState->filepath : "")); + debugs(9, 4, (ftpState->filepath ? ftpState->filepath : "")); safe_free(ftpState->dirpath); ftpState->dirpath = ftpState->filepath; @@ -1429,7 +1429,7 @@ ftpTraverseDirectory(Ftp::Gateway * ftpState) /* Done? */ if (ftpState->pathcomps == NULL) { - debugs(9, 3, HERE << "the final component was a directory"); + debugs(9, 3, "the final component was a directory"); ftpListDir(ftpState); return; } @@ -1441,7 +1441,7 @@ ftpTraverseDirectory(Ftp::Gateway * ftpState) if (ftpState->pathcomps != NULL || ftpState->flags.isdir) { ftpSendCwd(ftpState); } else { - debugs(9, 3, HERE << "final component is probably a file"); + debugs(9, 3, "final component is probably a file"); ftpGetFile(ftpState); return; } @@ -1456,7 +1456,7 @@ ftpSendCwd(Ftp::Gateway * ftpState) if (!ftpState || !ftpState->haveControlChannel("ftpSendCwd")) return; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); path = ftpState->filepath; @@ -1477,7 +1477,7 @@ static void ftpReadCwd(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code >= 200 && code < 300) { /* CWD OK */ @@ -1513,7 +1513,7 @@ ftpSendMkdir(Ftp::Gateway * ftpState) return; path = ftpState->filepath; - debugs(9, 3, HERE << "with path=" << path); + debugs(9, 3, "with path=" << path); snprintf(cbuf, CTRL_BUFLEN, "MKD %s\r\n", path); ftpState->writeCommand(cbuf); ftpState->state = Ftp::Client::SENT_MKDIR; @@ -1525,7 +1525,7 @@ ftpReadMkdir(Ftp::Gateway * ftpState) char *path = ftpState->filepath; int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE << "path " << path << ", code " << code); + debugs(9, 3, "path " << path << ", code " << code); if (code == 257) { /* success */ ftpSendCwd(ftpState); @@ -1552,7 +1552,7 @@ static void ftpListDir(Ftp::Gateway * ftpState) { if (ftpState->flags.dir_slash) { - debugs(9, 3, HERE << "Directory path did not end in /"); + debugs(9, 3, "Directory path did not end in /"); ftpState->title_url.append("/"); ftpState->flags.isdir = 1; } @@ -1577,7 +1577,7 @@ static void ftpReadMdtm(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code == 213) { ftpState->mdtm = parse_iso3307_time(ftpState->ctrl.last_reply); @@ -1615,7 +1615,7 @@ static void ftpReadSize(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code == 213) { ftpState->unhack(); @@ -1658,7 +1658,7 @@ ftpSendPassive(Ftp::Gateway * ftpState) if (!ftpState || !ftpState->haveControlChannel("ftpSendPassive")) return; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); /** \par * Checks for 'HEAD' method request and passes off for special handling by Ftp::Gateway::processHeadResponse(). */ @@ -1677,7 +1677,7 @@ ftpSendPassive(Ftp::Gateway * ftpState) void Ftp::Gateway::processHeadResponse() { - debugs(9, 5, HERE << "handling HEAD response"); + debugs(9, 5, "handling HEAD response"); ftpSendQuit(this); appendSuccessHeader(); @@ -1693,7 +1693,7 @@ Ftp::Gateway::processHeadResponse() #if USE_ADAPTATION if (adaptationAccessCheckPending) { - debugs(9,3, HERE << "returning due to adaptationAccessCheckPending"); + debugs(9,3, "returning due to adaptationAccessCheckPending"); return; } #endif @@ -1719,11 +1719,11 @@ ftpReadPasv(Ftp::Gateway * ftpState) void Ftp::Gateway::dataChannelConnected(const CommConnectCbParams &io) { - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); dataConnWait.finish(); if (io.flag != Comm::OK) { - debugs(9, 2, HERE << "Failed to connect. Retrying via another method."); + debugs(9, 2, "Failed to connect. Retrying via another method."); // ABORT on timeouts. server may be waiting on a broken TCP link. if (io.xerrno == Comm::TIMEOUT) @@ -1798,7 +1798,7 @@ ftpSendPORT(Ftp::Gateway * ftpState) return; } - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); ftpState->flags.pasv_supported = 0; ftpOpenListenSocket(ftpState, 0); @@ -1836,7 +1836,7 @@ static void ftpReadPORT(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code != 200) { /* Fall back on using the same port as the control connection */ @@ -1851,7 +1851,7 @@ static void ftpReadEPRT(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code != 200) { /* Failover to attempting old PORT command. */ @@ -1870,7 +1870,7 @@ ftpReadEPRT(Ftp::Gateway * ftpState) void Ftp::Gateway::ftpAcceptDataConnection(const CommAcceptCbParams &io) { - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (!Comm::IsConnOpen(ctrl.conn)) { /*Close handlers will cleanup*/ debugs(9, 5, "The control connection to the remote end is closed"); @@ -1933,7 +1933,7 @@ Ftp::Gateway::ftpAcceptDataConnection(const CommAcceptCbParams &io) data.opened(io.conn, dataCloser()); data.addr(io.conn->remote); - debugs(9, 3, HERE << "Connected data socket on " << + debugs(9, 3, "Connected data socket on " << io.conn << ". FD table says: " << "ctrl-peer= " << fd_table[ctrl.conn->fd].ipaddr << ", " << "data-peer= " << fd_table[data.conn->fd].ipaddr); @@ -1947,7 +1947,7 @@ Ftp::Gateway::ftpAcceptDataConnection(const CommAcceptCbParams &io) static void ftpRestOrList(Ftp::Gateway * ftpState) { - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (ftpState->typecode == 'D') { ftpState->flags.isdir = 1; @@ -1974,7 +1974,7 @@ ftpSendStor(Ftp::Gateway * ftpState) if (!ftpState || !ftpState->haveControlChannel("ftpSendStor")) return; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (ftpState->filepath != NULL) { /* Plain file upload */ @@ -2002,7 +2002,7 @@ ftpReadStor(Ftp::Gateway * ftpState) void Ftp::Gateway::readStor() { int code = ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code == 125 || (code == 150 && Comm::IsConnOpen(data.conn))) { if (!originalRequest()->body_pipe) { @@ -2018,12 +2018,12 @@ void Ftp::Gateway::readStor() } /* When client status is 125, or 150 and the data connection is open, Begin data transfer. */ - debugs(9, 3, HERE << "starting data transfer"); + debugs(9, 3, "starting data transfer"); switchTimeoutToDataChannel(); sendMoreRequestBody(); fwd->dontRetry(true); // do not permit re-trying if the body was sent. state = WRITING_DATA; - debugs(9, 3, HERE << "writing data channel"); + debugs(9, 3, "writing data channel"); } else if (code == 150) { /* When client code is 150 with no data channel, Accept data channel. */ debugs(9, 3, "ftpReadStor: accepting data channel"); @@ -2041,7 +2041,7 @@ ftpSendRest(Ftp::Gateway * ftpState) if (!ftpState || !ftpState->haveControlChannel("ftpSendRest")) return; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); snprintf(cbuf, CTRL_BUFLEN, "REST %" PRId64 "\r\n", ftpState->restart_offset); ftpState->writeCommand(cbuf); @@ -2079,14 +2079,14 @@ static void ftpReadRest(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); assert(ftpState->restart_offset > 0); if (code == 350) { ftpState->setCurrentOffset(ftpState->restart_offset); ftpSendRetr(ftpState); } else if (code > 0) { - debugs(9, 3, HERE << "REST not supported"); + debugs(9, 3, "REST not supported"); ftpState->flags.rest_supported = 0; ftpSendRetr(ftpState); } else { @@ -2101,7 +2101,7 @@ ftpSendList(Ftp::Gateway * ftpState) if (!ftpState || !ftpState->haveControlChannel("ftpSendList")) return; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (ftpState->filepath) { snprintf(cbuf, CTRL_BUFLEN, "LIST %s\r\n", ftpState->filepath); @@ -2120,7 +2120,7 @@ ftpSendNlst(Ftp::Gateway * ftpState) if (!ftpState || !ftpState->haveControlChannel("ftpSendNlst")) return; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); ftpState->flags.tried_nlst = 1; @@ -2138,18 +2138,18 @@ static void ftpReadList(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code == 125 || (code == 150 && Comm::IsConnOpen(ftpState->data.conn))) { /* Begin data transfer */ - debugs(9, 3, HERE << "begin data transfer from " << ftpState->data.conn->remote << " (" << ftpState->data.conn->local << ")"); + debugs(9, 3, "begin data transfer from " << ftpState->data.conn->remote << " (" << ftpState->data.conn->local << ")"); ftpState->switchTimeoutToDataChannel(); ftpState->maybeReadVirginBody(); ftpState->state = Ftp::Client::READING_DATA; return; } else if (code == 150) { /* Accept data channel */ - debugs(9, 3, HERE << "accept data channel from " << ftpState->data.conn->remote << " (" << ftpState->data.conn->local << ")"); + debugs(9, 3, "accept data channel from " << ftpState->data.conn->remote << " (" << ftpState->data.conn->local << ")"); ftpState->listenForDataChannel(ftpState->data.conn); return; } else if (!ftpState->flags.tried_nlst && code > 300) { @@ -2167,7 +2167,7 @@ ftpSendRetr(Ftp::Gateway * ftpState) if (!ftpState || !ftpState->haveControlChannel("ftpSendRetr")) return; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); assert(ftpState->filepath != NULL); snprintf(cbuf, CTRL_BUFLEN, "RETR %s\r\n", ftpState->filepath); @@ -2179,11 +2179,11 @@ static void ftpReadRetr(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code == 125 || (code == 150 && Comm::IsConnOpen(ftpState->data.conn))) { /* Begin data transfer */ - debugs(9, 3, HERE << "begin data transfer from " << ftpState->data.conn->remote << " (" << ftpState->data.conn->local << ")"); + debugs(9, 3, "begin data transfer from " << ftpState->data.conn->remote << " (" << ftpState->data.conn->local << ")"); ftpState->switchTimeoutToDataChannel(); ftpState->maybeReadVirginBody(); ftpState->state = Ftp::Client::READING_DATA; @@ -2225,7 +2225,7 @@ static void ftpReadTransferDone(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (code == 226 || code == 250) { /* Connection closed; retrieval done. */ @@ -2236,7 +2236,7 @@ ftpReadTransferDone(Ftp::Gateway * ftpState) ftpState->markParsedVirginReplyAsWhole("ftpReadTransferDone code 226 or 250"); ftpSendQuit(ftpState); } else { /* != 226 */ - debugs(9, DBG_IMPORTANT, HERE << "Got code " << code << " after reading data"); + debugs(9, DBG_IMPORTANT, "Got code " << code << " after reading data"); ftpState->failed(ERR_FTP_FAILURE, 0); /* failed closes ctrl.conn and frees ftpState */ return; @@ -2248,7 +2248,7 @@ void Ftp::Gateway::handleRequestBodyProducerAborted() { Client::handleRequestBodyProducerAborted(); - debugs(9, 3, HERE << "ftpState=" << this); + debugs(9, 3, "ftpState=" << this); failed(ERR_READ_ERROR, 0); } @@ -2256,10 +2256,10 @@ static void ftpWriteTransferDone(Ftp::Gateway * ftpState) { int code = ftpState->ctrl.replycode; - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (!(code == 226 || code == 250)) { - debugs(9, DBG_IMPORTANT, HERE << "Got code " << code << " after sending data"); + debugs(9, DBG_IMPORTANT, "Got code " << code << " after sending data"); ftpState->failed(ERR_FTP_PUT_ERROR, 0); return; } @@ -2296,7 +2296,7 @@ ftpTrySlashHack(Ftp::Gateway * ftpState) ftpState->flags.try_slash_hack = 1; /* Free old paths */ - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (ftpState->pathcomps) wordlistDestroy(&ftpState->pathcomps); @@ -2320,7 +2320,7 @@ ftpTrySlashHack(Ftp::Gateway * ftpState) void Ftp::Gateway::unhack() { - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (old_request != NULL) { safe_free(old_request); @@ -2336,7 +2336,7 @@ Ftp::Gateway::hackShortcut(FTPSM * nextState) restart_offset = 0; /* Save old error message & some state info */ - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (old_request == NULL) { old_request = ctrl.last_command; @@ -2438,10 +2438,10 @@ ftpSendReply(Ftp::Gateway * ftpState) Http::StatusCode http_code; err_type err_code = ERR_NONE; - debugs(9, 3, HERE << ftpState->entry->url() << ", code " << code); + debugs(9, 3, ftpState->entry->url() << ", code " << code); if (cbdataReferenceValid(ftpState)) - debugs(9, 5, HERE << "ftpState (" << ftpState << ") is valid!"); + debugs(9, 5, "ftpState (" << ftpState << ") is valid!"); if (code == 226 || code == 250) { err_code = (ftpState->mdtm > 0) ? ERR_FTP_PUT_MODIFIED : ERR_FTP_PUT_CREATED; @@ -2478,7 +2478,7 @@ ftpSendReply(Ftp::Gateway * ftpState) void Ftp::Gateway::appendSuccessHeader() { - debugs(9, 3, HERE); + debugs(9, 3, MYNAME); if (flags.http_header_sent) return; @@ -2628,7 +2628,7 @@ Ftp::Gateway::printfReplyBody(const char *fmt, ...) void Ftp::Gateway::writeReplyBody(const char *dataToWrite, size_t dataLength) { - debugs(9, 5, HERE << "writing " << dataLength << " bytes to the reply"); + debugs(9, 5, "writing " << dataLength << " bytes to the reply"); addVirginReplyBody(dataToWrite, dataLength); } diff --git a/src/clients/FtpRelay.cc b/src/clients/FtpRelay.cc index 6e7cc6071d..768fbce710 100644 --- a/src/clients/FtpRelay.cc +++ b/src/clients/FtpRelay.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clients/HttpTunneler.cc b/src/clients/HttpTunneler.cc index 7145786607..a5af5a5d9b 100644 --- a/src/clients/HttpTunneler.cc +++ b/src/clients/HttpTunneler.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clients/HttpTunneler.h b/src/clients/HttpTunneler.h index dfd844e2ff..e88d17610f 100644 --- a/src/clients/HttpTunneler.h +++ b/src/clients/HttpTunneler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clients/HttpTunnelerAnswer.cc b/src/clients/HttpTunnelerAnswer.cc index e081c00fa9..a46a7095a9 100644 --- a/src/clients/HttpTunnelerAnswer.cc +++ b/src/clients/HttpTunnelerAnswer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clients/HttpTunnelerAnswer.h b/src/clients/HttpTunnelerAnswer.h index 8cb7cbc8a8..b26bb32aa0 100644 --- a/src/clients/HttpTunnelerAnswer.h +++ b/src/clients/HttpTunnelerAnswer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/clients/Makefile.am b/src/clients/Makefile.am index da0a85411e..c70bf47ce9 100644 --- a/src/clients/Makefile.am +++ b/src/clients/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/clients/forward.h b/src/clients/forward.h index c423ee2f39..82e5eb9bd2 100644 --- a/src/clients/forward.h +++ b/src/clients/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm.cc b/src/comm.cc index 8878797dcb..d5b30528b9 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -419,7 +419,7 @@ comm_init_opened(const Comm::ConnectionPointer &conn, assert(AI); /* update fdstat */ - debugs(5, 5, HERE << conn << " is a new socket"); + debugs(5, 5, conn << " is a new socket"); assert(!isOpen(conn->fd)); // NP: global isOpen checks the fde entry for openness not the Comm::Connection fd_open(conn->fd, FD_SOCKET, note); @@ -512,7 +512,7 @@ comm_import_opened(const Comm::ConnectionPointer &conn, const char *note, struct addrinfo *AI) { - debugs(5, 2, HERE << conn); + debugs(5, 2, conn); assert(Comm::IsConnOpen(conn)); assert(AI); @@ -550,7 +550,7 @@ comm_import_opened(const Comm::ConnectionPointer &conn, void commUnsetFdTimeout(int fd) { - debugs(5, 3, HERE << "Remove timeout for FD " << fd); + debugs(5, 3, "Remove timeout for FD " << fd); assert(fd >= 0); assert(fd < Squid_MaxFD); fde *F = &fd_table[fd]; @@ -563,7 +563,7 @@ commUnsetFdTimeout(int fd) int commSetConnTimeout(const Comm::ConnectionPointer &conn, int timeout, AsyncCall::Pointer &callback) { - debugs(5, 3, HERE << conn << " timeout " << timeout); + debugs(5, 3, conn << " timeout " << timeout); assert(Comm::IsConnOpen(conn)); assert(conn->fd < Squid_MaxFD); fde *F = &fd_table[conn->fd]; @@ -589,7 +589,7 @@ commSetConnTimeout(const Comm::ConnectionPointer &conn, int timeout, AsyncCall:: int commUnsetConnTimeout(const Comm::ConnectionPointer &conn) { - debugs(5, 3, HERE << "Remove timeout for " << conn); + debugs(5, 3, "Remove timeout for " << conn); AsyncCall::Pointer nil; return commSetConnTimeout(conn, -1, nil); } @@ -611,7 +611,7 @@ comm_connect_addr(int sock, const Ip::Address &address) assert(address.port() != 0); - debugs(5, 9, HERE << "connecting socket FD " << sock << " to " << address << " (want family: " << F->sock_family << ")"); + debugs(5, 9, "connecting socket FD " << sock << " to " << address << " (want family: " << F->sock_family << ")"); /* Handle IPv6 over IPv4-only socket case. * this case must presently be handled here since the getAddrInfo asserts on bad mappings. @@ -1290,12 +1290,12 @@ ClientInfo::quota() // Rounding errors do not accumulate here, but we round down to avoid // negative bucket sizes after write with rationedCount=1. rationedQuota = static_cast(floor(bucketLevel/rationedCount)); - debugs(77,5, HERE << "new rationedQuota: " << rationedQuota << + debugs(77,5, "new rationedQuota: " << rationedQuota << '*' << rationedCount); } --rationedCount; - debugs(77,7, HERE << "rationedQuota: " << rationedQuota << + debugs(77,7, "rationedQuota: " << rationedQuota << " rations remaining: " << rationedCount); // update 'last seen' time to prevent clientdb GC from dropping us @@ -1550,7 +1550,7 @@ checkTimeouts(void) void commStartHalfClosedMonitor(int fd) { - debugs(5, 5, HERE << "adding FD " << fd << " to " << *TheHalfClosed); + debugs(5, 5, "adding FD " << fd << " to " << *TheHalfClosed); assert(isOpen(fd) && !commHasHalfClosedMonitor(fd)); (void)TheHalfClosed->add(fd); // could also assert the result fd_table[fd].codeContext = CodeContext::Current(); @@ -1573,7 +1573,7 @@ static void commHalfClosedCheck(void *) { - debugs(5, 5, HERE << "checking " << *TheHalfClosed); + debugs(5, 5, "checking " << *TheHalfClosed); typedef DescriptorSet::const_iterator DSCI; const DSCI end = TheHalfClosed->end(); @@ -1607,7 +1607,7 @@ commHasHalfClosedMonitor(int fd) void commStopHalfClosedMonitor(int const fd) { - debugs(5, 5, HERE << "removing FD " << fd << " from " << *TheHalfClosed); + debugs(5, 5, "removing FD " << fd << " from " << *TheHalfClosed); // cancel the read if one was scheduled AsyncCall::Pointer reader = fd_table[fd].halfClosedReader; @@ -1635,7 +1635,7 @@ commHalfClosedReader(const Comm::ConnectionPointer &conn, char *, size_t size, C // if read failed, close the connection if (flag != Comm::OK) { - debugs(5, 3, HERE << "closing " << conn); + debugs(5, 3, "closing " << conn); conn->close(); return; } @@ -1844,7 +1844,7 @@ comm_open_uds(int sock_type, AI.ai_canonname = NULL; AI.ai_next = NULL; - debugs(50, 3, HERE << "Attempt open socket for: " << addr->sun_path); + debugs(50, 3, "Attempt open socket for: " << addr->sun_path); if ((new_socket = socket(AI.ai_family, AI.ai_socktype, AI.ai_protocol)) < 0) { int xerrno = errno; @@ -1864,7 +1864,7 @@ comm_open_uds(int sock_type, debugs(50, 3, "Opened UDS FD " << new_socket << " : family=" << AI.ai_family << ", type=" << AI.ai_socktype << ", protocol=" << AI.ai_protocol); /* update fdstat */ - debugs(50, 5, HERE << "FD " << new_socket << " is a new socket"); + debugs(50, 5, "FD " << new_socket << " is a new socket"); assert(!isOpen(new_socket)); fd_open(new_socket, FD_MSGHDR, addr->sun_path); diff --git a/src/comm.h b/src/comm.h index c27fe01045..fa4c62a21c 100644 --- a/src/comm.h +++ b/src/comm.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/AcceptLimiter.cc b/src/comm/AcceptLimiter.cc index 9a33c66192..93f417b49c 100644 --- a/src/comm/AcceptLimiter.cc +++ b/src/comm/AcceptLimiter.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/AcceptLimiter.h b/src/comm/AcceptLimiter.h index 95be974fb2..b93c1ecdd9 100644 --- a/src/comm/AcceptLimiter.h +++ b/src/comm/AcceptLimiter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc index f405f8fd54..da709976fa 100644 --- a/src/comm/ConnOpener.cc +++ b/src/comm/ConnOpener.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -364,12 +364,12 @@ Comm::ConnOpener::doConnect() switch (comm_connect_addr(temporaryFd_, conn_->remote) ) { case Comm::INPROGRESS: - debugs(5, 5, HERE << conn_ << ": Comm::INPROGRESS"); + debugs(5, 5, conn_ << ": Comm::INPROGRESS"); Comm::SetSelect(temporaryFd_, COMM_SELECT_WRITE, Comm::ConnOpener::InProgressConnectRetry, new Pointer(this), 0); break; case Comm::OK: - debugs(5, 5, HERE << conn_ << ": Comm::OK - connected"); + debugs(5, 5, conn_ << ": Comm::OK - connected"); connected(); break; @@ -381,12 +381,12 @@ Comm::ConnOpener::doConnect() Config.connect_retries << ": " << xstrerr(xerrno)); if (failRetries_ < Config.connect_retries) { - debugs(5, 5, HERE << conn_ << ": * - try again"); + debugs(5, 5, conn_ << ": * - try again"); retrySleep(); return; } else { // send ERROR back to the upper layer. - debugs(5, 5, HERE << conn_ << ": * - ERR tried too many times already."); + debugs(5, 5, conn_ << ": * - ERR tried too many times already."); sendAnswer(Comm::ERR_CONNECT, xerrno, "Comm::ConnOpener::doConnect"); } } @@ -442,7 +442,7 @@ Comm::ConnOpener::lookupLocalAddress() conn_->local = *addr; Ip::Address::FreeAddr(addr); - debugs(5, 6, HERE << conn_); + debugs(5, 6, conn_); } /** Abort connection attempt. @@ -451,7 +451,7 @@ Comm::ConnOpener::lookupLocalAddress() void Comm::ConnOpener::earlyAbort(const CommCloseCbParams &io) { - debugs(5, 3, HERE << io.conn); + debugs(5, 3, io.conn); calls_.earlyAbort_ = NULL; // NP: is closing or shutdown better? sendAnswer(Comm::ERR_CLOSING, io.xerrno, "Comm::ConnOpener::earlyAbort"); @@ -464,7 +464,7 @@ Comm::ConnOpener::earlyAbort(const CommCloseCbParams &io) void Comm::ConnOpener::timeout(const CommTimeoutCbParams &) { - debugs(5, 5, HERE << conn_ << ": * - ERR took too long to receive response."); + debugs(5, 5, conn_ << ": * - ERR took too long to receive response."); calls_.timeout_ = NULL; sendAnswer(Comm::TIMEOUT, ETIMEDOUT, "Comm::ConnOpener::timeout"); } diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h index 68ef114ab0..e1e60649dc 100644 --- a/src/comm/ConnOpener.h +++ b/src/comm/ConnOpener.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/Connection.cc b/src/comm/Connection.cc index 279b1c2f4a..517831ecf8 100644 --- a/src/comm/Connection.cc +++ b/src/comm/Connection.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/Connection.h b/src/comm/Connection.h index 73fcc51369..2d3ce32ea1 100644 --- a/src/comm/Connection.h +++ b/src/comm/Connection.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/Flag.h b/src/comm/Flag.h index 391e6341a7..1ea53193f1 100644 --- a/src/comm/Flag.h +++ b/src/comm/Flag.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/IoCallback.cc b/src/comm/IoCallback.cc index 324688b516..e235a39597 100644 --- a/src/comm/IoCallback.cc +++ b/src/comm/IoCallback.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/IoCallback.h b/src/comm/IoCallback.h index b6066525df..5b52f405b8 100644 --- a/src/comm/IoCallback.h +++ b/src/comm/IoCallback.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/Loops.h b/src/comm/Loops.h index 64a083180d..7c53dc5986 100644 --- a/src/comm/Loops.h +++ b/src/comm/Loops.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/Makefile.am b/src/comm/Makefile.am index a5c933d608..fbb7fb30c2 100644 --- a/src/comm/Makefile.am +++ b/src/comm/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/comm/ModDevPoll.cc b/src/comm/ModDevPoll.cc index 94e8f20fb1..3031acb1ef 100644 --- a/src/comm/ModDevPoll.cc +++ b/src/comm/ModDevPoll.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -106,7 +106,7 @@ comm_flush_updates(void) debugs( 5, DEBUG_DEVPOLL ? 0 : 8, - HERE << (devpoll_update.cur + 1) << " fds queued" + (devpoll_update.cur + 1) << " fds queued" ); i = write( @@ -134,7 +134,7 @@ comm_update_fd(int fd, int events) debugs( 5, DEBUG_DEVPOLL ? 0 : 8, - HERE << "FD " << fd << ", events=" << events + "FD " << fd << ", events=" << events ); /* Is the array already full and in need of flushing? */ @@ -224,7 +224,7 @@ void Comm::SetSelect(int fd, unsigned int type, PF * handler, void *client_data, time_t timeout) { assert(fd >= 0); - debugs(5, 5, HERE << "FD " << fd << ", type=" << type << + debugs(5, 5, "FD " << fd << ", type=" << type << ", handler=" << handler << ", client_data=" << client_data << ", timeout=" << timeout); @@ -351,7 +351,7 @@ Comm::DoSelect(int msec) debugs( 5, DEBUG_DEVPOLL ? 0 : 8, - HERE << "got FD " << fd + "got FD " << fd << ",events=" << std::hex << do_poll.dp_fds[i].revents << ",monitoring=" << devpoll_state[fd].state << ",F->read_handler=" << F->read_handler @@ -361,8 +361,8 @@ Comm::DoSelect(int msec) /* handle errors */ if (do_poll.dp_fds[i].revents & (POLLERR | POLLHUP | POLLNVAL)) { debugs(5, DEBUG_DEVPOLL ? 0 : 8, - "ERROR: devpoll event failure: fd " << fd - ); + "ERROR: devpoll event failure: fd " << fd + ); continue; } @@ -372,7 +372,7 @@ Comm::DoSelect(int msec) debugs( 5, DEBUG_DEVPOLL ? 0 : 8, - HERE << "Calling read handler on FD " << fd + "Calling read handler on FD " << fd ); F->read_handler = NULL; hdl(fd, F->read_data); @@ -381,7 +381,7 @@ Comm::DoSelect(int msec) debugs( 5, DEBUG_DEVPOLL ? 0 : 8, - HERE << "no read handler for FD " << fd + "no read handler for FD " << fd ); // remove interest since no handler exist for this event. SetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0); @@ -394,7 +394,7 @@ Comm::DoSelect(int msec) debugs( 5, DEBUG_DEVPOLL ? 0 : 8, - HERE << "Calling write handler on FD " << fd + "Calling write handler on FD " << fd ); F->write_handler = NULL; hdl(fd, F->write_data); @@ -403,7 +403,7 @@ Comm::DoSelect(int msec) debugs( 5, DEBUG_DEVPOLL ? 0 : 8, - HERE << "no write handler for FD " << fd + "no write handler for FD " << fd ); // remove interest since no handler exist for this event. SetSelect(fd, COMM_SELECT_WRITE, NULL, NULL, 0); diff --git a/src/comm/ModEpoll.cc b/src/comm/ModEpoll.cc index 335ab1ecc8..46bb7b3c83 100644 --- a/src/comm/ModEpoll.cc +++ b/src/comm/ModEpoll.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -112,7 +112,7 @@ Comm::SetSelect(int fd, unsigned int type, PF * handler, void *client_data, time int epoll_ctl_type = 0; assert(fd >= 0); - debugs(5, 5, HERE << "FD " << fd << ", type=" << type << + debugs(5, 5, "FD " << fd << ", type=" << type << ", handler=" << handler << ", client_data=" << client_data << ", timeout=" << timeout); @@ -253,7 +253,7 @@ Comm::DoSelect(int msec) fd = cevents->data.fd; F = &fd_table[fd]; CodeContext::Reset(F->codeContext); - debugs(5, DEBUG_EPOLL ? 0 : 8, HERE << "got FD " << fd << " events=" << + debugs(5, DEBUG_EPOLL ? 0 : 8, "got FD " << fd << " events=" << std::hex << cevents->events << " monitoring=" << F->epoll_state << " F->read_handler=" << F->read_handler << " F->write_handler=" << F->write_handler); @@ -261,12 +261,12 @@ Comm::DoSelect(int msec) if (cevents->events & (EPOLLIN|EPOLLHUP|EPOLLERR) || F->flags.read_pending) { if ((hdl = F->read_handler) != NULL) { - debugs(5, DEBUG_EPOLL ? 0 : 8, HERE << "Calling read handler on FD " << fd); + debugs(5, DEBUG_EPOLL ? 0 : 8, "Calling read handler on FD " << fd); F->read_handler = NULL; hdl(fd, F->read_data); ++ statCounter.select_fds; } else { - debugs(5, DEBUG_EPOLL ? 0 : 8, HERE << "no read handler for FD " << fd); + debugs(5, DEBUG_EPOLL ? 0 : 8, "no read handler for FD " << fd); // remove interest since no handler exist for this event. SetSelect(fd, COMM_SELECT_READ, NULL, NULL, 0); } @@ -274,12 +274,12 @@ Comm::DoSelect(int msec) if (cevents->events & (EPOLLOUT|EPOLLHUP|EPOLLERR)) { if ((hdl = F->write_handler) != NULL) { - debugs(5, DEBUG_EPOLL ? 0 : 8, HERE << "Calling write handler on FD " << fd); + debugs(5, DEBUG_EPOLL ? 0 : 8, "Calling write handler on FD " << fd); F->write_handler = NULL; hdl(fd, F->write_data); ++ statCounter.select_fds; } else { - debugs(5, DEBUG_EPOLL ? 0 : 8, HERE << "no write handler for FD " << fd); + debugs(5, DEBUG_EPOLL ? 0 : 8, "no write handler for FD " << fd); // remove interest since no handler exist for this event. SetSelect(fd, COMM_SELECT_WRITE, NULL, NULL, 0); } diff --git a/src/comm/ModKqueue.cc b/src/comm/ModKqueue.cc index 1473274d83..38dd4da009 100644 --- a/src/comm/ModKqueue.cc +++ b/src/comm/ModKqueue.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -169,7 +169,7 @@ Comm::SetSelect(int fd, unsigned int type, PF * handler, void *client_data, time fde *F = &fd_table[fd]; assert(fd >= 0); assert(F->flags.open || (!handler && !client_data && !timeout)); - debugs(5, 5, HERE << "FD " << fd << ", type=" << type << + debugs(5, 5, "FD " << fd << ", type=" << type << ", handler=" << handler << ", client_data=" << client_data << ", timeout=" << timeout); diff --git a/src/comm/ModPoll.cc b/src/comm/ModPoll.cc index 3415026ebd..113f9e59f9 100644 --- a/src/comm/ModPoll.cc +++ b/src/comm/ModPoll.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -125,7 +125,7 @@ Comm::SetSelect(int fd, unsigned int type, PF * handler, void *client_data, time fde *F = &fd_table[fd]; assert(fd >= 0); assert(F->flags.open || (!handler && !client_data && !timeout)); - debugs(5, 5, HERE << "FD " << fd << ", type=" << type << + debugs(5, 5, "FD " << fd << ", type=" << type << ", handler=" << handler << ", client_data=" << client_data << ", timeout=" << timeout); diff --git a/src/comm/ModSelect.cc b/src/comm/ModSelect.cc index 5fb821816d..7c4d80b71b 100644 --- a/src/comm/ModSelect.cc +++ b/src/comm/ModSelect.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -125,7 +125,7 @@ Comm::SetSelect(int fd, unsigned int type, PF * handler, void *client_data, time fde *F = &fd_table[fd]; assert(fd >= 0); assert(F->flags.open || (!handler && !client_data && !timeout)); - debugs(5, 5, HERE << "FD " << fd << ", type=" << type << + debugs(5, 5, "FD " << fd << ", type=" << type << ", handler=" << handler << ", client_data=" << client_data << ", timeout=" << timeout); diff --git a/src/comm/ModSelectWin32.cc b/src/comm/ModSelectWin32.cc index 92c42d06ab..8a501d55af 100644 --- a/src/comm/ModSelectWin32.cc +++ b/src/comm/ModSelectWin32.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -119,7 +119,7 @@ Comm::SetSelect(int fd, unsigned int type, PF * handler, void *client_data, time fde *F = &fd_table[fd]; assert(fd >= 0); assert(F->flags.open || (!handler && !client_data && !timeout)); - debugs(5, 5, HERE << "FD " << fd << ", type=" << type << + debugs(5, 5, "FD " << fd << ", type=" << type << ", handler=" << handler << ", client_data=" << client_data << ", timeout=" << timeout); diff --git a/src/comm/Read.cc b/src/comm/Read.cc index 98627135d2..75e2c5bad0 100644 --- a/src/comm/Read.cc +++ b/src/comm/Read.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/Read.h b/src/comm/Read.h index d0d4ab3c32..122394098f 100644 --- a/src/comm/Read.h +++ b/src/comm/Read.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/Tcp.cc b/src/comm/Tcp.cc index c1c7346668..a0d450f020 100644 --- a/src/comm/Tcp.cc +++ b/src/comm/Tcp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -42,7 +42,7 @@ SetSocketOption(const int fd, const int level, const int optName, const Option & static bool SetBooleanSocketOption(const int fd, const int level, const int optName, const bool enable) { - const int optValue = enable ? 1 : 0; + const int optValue = enable ? 1 :0; return SetSocketOption(fd, level, optName, optValue); } diff --git a/src/comm/Tcp.h b/src/comm/Tcp.h index 94508d2c3d..23e807a2cb 100644 --- a/src/comm/Tcp.h +++ b/src/comm/Tcp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc index 2694ea7173..73ab12c5c9 100644 --- a/src/comm/TcpAcceptor.cc +++ b/src/comm/TcpAcceptor.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -58,7 +58,7 @@ Comm::TcpAcceptor::TcpAcceptor(const AnyP::PortCfgPointer &p, const char *, cons void Comm::TcpAcceptor::subscribe(const Subscription::Pointer &aSub) { - debugs(5, 5, HERE << status() << " AsyncCall Subscription: " << aSub); + debugs(5, 5, status() << " AsyncCall Subscription: " << aSub); unsubscribe("subscription change"); theCallSub = aSub; } @@ -66,7 +66,7 @@ Comm::TcpAcceptor::subscribe(const Subscription::Pointer &aSub) void Comm::TcpAcceptor::unsubscribe(const char *reason) { - debugs(5, 5, HERE << status() << " AsyncCall Subscription " << theCallSub << " removed: " << reason); + debugs(5, 5, status() << " AsyncCall Subscription " << theCallSub << " removed: " << reason); theCallSub = NULL; } @@ -75,7 +75,7 @@ Comm::TcpAcceptor::start() { if (listenPort_) CodeContext::Reset(listenPort_); - debugs(5, 5, HERE << status() << " AsyncCall Subscription: " << theCallSub); + debugs(5, 5, status() << " AsyncCall Subscription: " << theCallSub); Must(IsConnOpen(conn)); @@ -108,7 +108,7 @@ Comm::TcpAcceptor::doneAll() const void Comm::TcpAcceptor::swanSong() { - debugs(5,5, HERE); + debugs(5,5, MYNAME); unsubscribe("swanSong"); if (IsConnOpen(conn)) { if (closer_ != NULL) @@ -212,7 +212,7 @@ void Comm::TcpAcceptor::doAccept(int fd, void *data) { try { - debugs(5, 2, HERE << "New connection on FD " << fd); + debugs(5, 2, "New connection on FD " << fd); Must(isOpen(fd)); TcpAcceptor *afd = static_cast(data); @@ -278,7 +278,7 @@ Comm::TcpAcceptor::acceptOne() if (flag == Comm::COMM_ERROR) { // A non-recoverable error; notify the caller */ - debugs(5, 5, HERE << "non-recoverable error:" << status() << " handler Subscription: " << theCallSub); + debugs(5, 5, "non-recoverable error:" << status() << " handler Subscription: " << theCallSub); if (intendedForUserConnections()) logAcceptError(newConnDetails); notify(flag, newConnDetails); @@ -306,7 +306,7 @@ void Comm::TcpAcceptor::acceptNext() { Must(IsConnOpen(conn)); - debugs(5, 2, HERE << "connection on " << conn); + debugs(5, 2, "connection on " << conn); acceptOne(); } diff --git a/src/comm/TcpAcceptor.h b/src/comm/TcpAcceptor.h index 1b320e6295..553e1cc4ea 100644 --- a/src/comm/TcpAcceptor.h +++ b/src/comm/TcpAcceptor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/UdpOpenDialer.h b/src/comm/UdpOpenDialer.h index 8aed5fd403..5833cc350a 100644 --- a/src/comm/UdpOpenDialer.h +++ b/src/comm/UdpOpenDialer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/Write.cc b/src/comm/Write.cc index 8d211e0c4f..aeee04db98 100644 --- a/src/comm/Write.cc +++ b/src/comm/Write.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -33,7 +33,7 @@ Comm::Write(const Comm::ConnectionPointer &conn, MemBuf *mb, AsyncCall::Pointer void Comm::Write(const Comm::ConnectionPointer &conn, const char *buf, int size, AsyncCall::Pointer &callback, FREE * free_func) { - debugs(5, 5, HERE << conn << ": sz " << size << ": asynCall " << callback); + debugs(5, 5, conn << ": sz " << size << ": asynCall " << callback); /* Make sure we are open, not closing, and not writing */ assert(fd_table[conn->fd].flags.open); @@ -63,7 +63,7 @@ Comm::HandleWrite(int fd, void *data) assert(state->conn != NULL); assert(state->conn->fd == fd); - debugs(5, 5, HERE << state->conn << ": off " << + debugs(5, 5, state->conn << ": off " << (long int) state->offset << ", sz " << (long int) state->size << "."); nleft = state->size - state->offset; @@ -83,7 +83,7 @@ Comm::HandleWrite(int fd, void *data) int xerrno = errno = 0; len = FD_WRITE_METHOD(fd, state->buf + state->offset, nleft); xerrno = errno; - debugs(5, 5, HERE << "write() returns " << len); + debugs(5, 5, "write() returns " << len); #if USE_DELAY_POOLS if (bucket) { diff --git a/src/comm/Write.h b/src/comm/Write.h index d78c46b325..b92e7949af 100644 --- a/src/comm/Write.h +++ b/src/comm/Write.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/comm_internal.h b/src/comm/comm_internal.h index fc8b2f3635..40b3dcd7aa 100644 --- a/src/comm/comm_internal.h +++ b/src/comm/comm_internal.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm/forward.h b/src/comm/forward.h index 51ffb5a3fd..662879cae5 100644 --- a/src/comm/forward.h +++ b/src/comm/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/comm_poll.h b/src/comm_poll.h index 51bdf8fd0c..0144193e3a 100644 --- a/src/comm_poll.h +++ b/src/comm_poll.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/debug.cc b/src/debug.cc index 39fc442169..24362422fa 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/defines.h b/src/defines.h index 92d9e295e0..4642c6a623 100644 --- a/src/defines.h +++ b/src/defines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/delay_pools.cc b/src/delay_pools.cc index 86fe2e709a..d27fefc1b8 100644 --- a/src/delay_pools.cc +++ b/src/delay_pools.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dlink.cc b/src/dlink.cc index 4424a7d909..bf20c335ce 100644 --- a/src/dlink.cc +++ b/src/dlink.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dlink.h b/src/dlink.h index 15d738ea3c..efbc85ccc6 100644 --- a/src/dlink.h +++ b/src/dlink.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns/LookupDetails.cc b/src/dns/LookupDetails.cc index 2ac477ea3c..cfd0766429 100644 --- a/src/dns/LookupDetails.cc +++ b/src/dns/LookupDetails.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns/LookupDetails.h b/src/dns/LookupDetails.h index 456f1f8e51..47f1f062f4 100644 --- a/src/dns/LookupDetails.h +++ b/src/dns/LookupDetails.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index fed0d57371..752ca7eea6 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/dns/forward.h b/src/dns/forward.h index 5866f61b5c..f8b6620429 100644 --- a/src/dns/forward.h +++ b/src/dns/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns/rfc1035.cc b/src/dns/rfc1035.cc index aaf2df9b49..5d870c0a78 100644 --- a/src/dns/rfc1035.cc +++ b/src/dns/rfc1035.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns/rfc1035.h b/src/dns/rfc1035.h index 2435dddd58..94f17c3e0b 100644 --- a/src/dns/rfc1035.h +++ b/src/dns/rfc1035.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns/rfc2671.cc b/src/dns/rfc2671.cc index 9480fcacad..efcb907288 100644 --- a/src/dns/rfc2671.cc +++ b/src/dns/rfc2671.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns/rfc2671.h b/src/dns/rfc2671.h index 53797f2920..b4e8ec7f28 100644 --- a/src/dns/rfc2671.h +++ b/src/dns/rfc2671.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns/rfc3596.cc b/src/dns/rfc3596.cc index 68ef11970e..19431aafb2 100644 --- a/src/dns/rfc3596.cc +++ b/src/dns/rfc3596.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns/rfc3596.h b/src/dns/rfc3596.h index db83740b45..0030040390 100644 --- a/src/dns/rfc3596.h +++ b/src/dns/rfc3596.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/dns_internal.cc b/src/dns_internal.cc index 574c11230a..b889759bfb 100644 --- a/src/dns_internal.cc +++ b/src/dns_internal.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -1214,7 +1214,7 @@ idnsGrokReply(const char *buf, size_t sz, int /*from_ns*/) q->pending = 0; if (message->tc) { - debugs(78, 3, HERE << "Resolver requested TC (" << q->query.name << ")"); + debugs(78, 3, "Resolver requested TC (" << q->query.name << ")"); rfc1035MessageDestroy(&message); if (!q->need_vc) { @@ -1224,7 +1224,7 @@ idnsGrokReply(const char *buf, size_t sz, int /*from_ns*/) } else { // Strange: A TCP DNS response with the truncation bit (TC) set. // Return an error and cleanup; no point in trying TCP again. - debugs(78, 3, HERE << "TCP DNS response"); + debugs(78, 3, "TCP DNS response"); idnsCallback(q, "Truncated TCP DNS response"); } @@ -1472,7 +1472,7 @@ idnsReadVC(const Comm::ConnectionPointer &conn, char *buf, size_t len, Comm::Fla } assert(vc->ns < nameservers.size()); - debugs(78, 3, HERE << conn << ": received " << vc->msg->contentSize() << " bytes via TCP from " << nameservers[vc->ns].S << "."); + debugs(78, 3, conn << ": received " << vc->msg->contentSize() << " bytes via TCP from " << nameservers[vc->ns].S << "."); idnsGrokReply(vc->msg->buf, vc->msg->contentSize(), vc->ns); vc->msg->clean(); @@ -1727,7 +1727,7 @@ idnsSendSlaveAAAAQuery(idns_query *master) q->query_id = idnsQueryID(); q->sz = rfc3596BuildAAAAQuery(q->name, q->buf, sizeof(q->buf), q->query_id, &q->query, Config.dns.packet_max); - debugs(78, 3, HERE << "buf is " << q->sz << " bytes for " << q->name << + debugs(78, 3, "buf is " << q->sz << " bytes for " << q->name << ", id = 0x" << std::hex << q->query_id); if (!q->sz) { delete q; diff --git a/src/enums.h b/src/enums.h index f4638b37f5..237b5c100a 100644 --- a/src/enums.h +++ b/src/enums.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/error/Detail.cc b/src/error/Detail.cc index 2c49241b9d..1dab0a7e7e 100644 --- a/src/error/Detail.cc +++ b/src/error/Detail.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/error/Detail.h b/src/error/Detail.h index a5cf795791..f8549d4095 100644 --- a/src/error/Detail.h +++ b/src/error/Detail.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/error/Error.cc b/src/error/Error.cc index 61702b87fe..871613eeba 100644 --- a/src/error/Error.cc +++ b/src/error/Error.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/error/Error.h b/src/error/Error.h index 6ab36900f6..fac099ee4d 100644 --- a/src/error/Error.h +++ b/src/error/Error.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/error/ExceptionErrorDetail.h b/src/error/ExceptionErrorDetail.h index 227d4f7789..c6a4393786 100644 --- a/src/error/ExceptionErrorDetail.h +++ b/src/error/ExceptionErrorDetail.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/error/Makefile.am b/src/error/Makefile.am index 42f4a4aeb7..bdc6d40edd 100644 --- a/src/error/Makefile.am +++ b/src/error/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/error/SysErrorDetail.h b/src/error/SysErrorDetail.h index 6f9c0b1974..2eafc12587 100644 --- a/src/error/SysErrorDetail.h +++ b/src/error/SysErrorDetail.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/error/forward.h b/src/error/forward.h index d2d088c333..6caa4cf5dc 100644 --- a/src/error/forward.h +++ b/src/error/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/errorpage.cc b/src/errorpage.cc index 9b01e996b1..3b9de53ed8 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -408,7 +408,7 @@ TemplateFile::tryLoadTemplate(const char *lang) if ( strlen(lang) == 2) { /* TODO glob the error directory for sub-dirs matching: '-*' */ /* use first result. */ - debugs(4,2, HERE << "wildcard fallback errors not coded yet."); + debugs(4,2, "wildcard fallback errors not coded yet."); } #endif @@ -532,17 +532,17 @@ TemplateFile::loadFor(const HttpRequest *request) char lang[256]; size_t pos = 0; // current parsing position in header string - debugs(4, 6, HERE << "Testing Header: '" << hdr << "'"); + debugs(4, 6, "Testing Header: '" << hdr << "'"); while ( strHdrAcptLangGetItem(hdr, lang, 256, pos) ) { /* wildcard uses the configured default language */ if (lang[0] == '*' && lang[1] == '\0') { - debugs(4, 6, HERE << "Found language '" << lang << "'. Using configured default."); + debugs(4, 6, "Found language '" << lang << "'. Using configured default."); return false; } - debugs(4, 6, HERE << "Found language '" << lang << "', testing for available template"); + debugs(4, 6, "Found language '" << lang << "', testing for available template"); if (tryLoadTemplate(lang)) { /* store the language we found for the Content-Language reply header */ @@ -775,7 +775,7 @@ static void errorSendComplete(const Comm::ConnectionPointer &conn, char *, size_t size, Comm::Flag errflag, int, void *data) { ErrorState *err = static_cast(data); - debugs(4, 3, HERE << conn << ", size=" << size); + debugs(4, 3, conn << ", size=" << size); if (errflag != Comm::ERR_CLOSING) { if (err->callback) { diff --git a/src/errorpage.h b/src/errorpage.h index 3218000cdc..4d4c955082 100644 --- a/src/errorpage.h +++ b/src/errorpage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Assign.cc b/src/esi/Assign.cc index b29048ecbf..f45712dd33 100644 --- a/src/esi/Assign.cc +++ b/src/esi/Assign.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Assign.h b/src/esi/Assign.h index ed7d1a050a..53dc38adff 100644 --- a/src/esi/Assign.h +++ b/src/esi/Assign.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Attempt.h b/src/esi/Attempt.h index b44f9239ed..42b1972a8b 100644 --- a/src/esi/Attempt.h +++ b/src/esi/Attempt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Context.cc b/src/esi/Context.cc index 31703ccdb3..d0d9f56cec 100644 --- a/src/esi/Context.cc +++ b/src/esi/Context.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Context.h b/src/esi/Context.h index 81424390f0..1ae63d6f8d 100644 --- a/src/esi/Context.h +++ b/src/esi/Context.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Element.h b/src/esi/Element.h index 3329ca2f71..188371fa67 100644 --- a/src/esi/Element.h +++ b/src/esi/Element.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -25,7 +25,7 @@ typedef enum { class ESIElement; struct esiTreeParent : public RefCountable { - virtual void provideData (ESISegment::Pointer /* data */ , ESIElement * /* source */ ) { + virtual void provideData (ESISegment::Pointer /* data */, ESIElement * /* source */ ) { /* make abstract when all functionality complete */ assert (0); } diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc index 9577a98aae..1e6b855b65 100644 --- a/src/esi/Esi.cc +++ b/src/esi/Esi.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -1384,7 +1384,7 @@ ESIContext::ParserState::popAll() void ESIContext::freeResources () { - debugs(86, 5, HERE << "Freeing for this=" << this); + debugs(86, 5, "Freeing for this=" << this); rep = nullptr; // refcounted diff --git a/src/esi/Esi.h b/src/esi/Esi.h index 26aece21a6..4527a11b2b 100644 --- a/src/esi/Esi.h +++ b/src/esi/Esi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Except.h b/src/esi/Except.h index 39f74c6d51..008cbf5f6e 100644 --- a/src/esi/Except.h +++ b/src/esi/Except.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/ExpatParser.cc b/src/esi/ExpatParser.cc index 9826d5c5b9..0dea17554e 100644 --- a/src/esi/ExpatParser.cc +++ b/src/esi/ExpatParser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/ExpatParser.h b/src/esi/ExpatParser.h index 00db7eebae..46477b0c88 100644 --- a/src/esi/ExpatParser.h +++ b/src/esi/ExpatParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Expression.cc b/src/esi/Expression.cc index 22e995aa28..72d849af6a 100644 --- a/src/esi/Expression.cc +++ b/src/esi/Expression.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Expression.h b/src/esi/Expression.h index 4bfb7ebdf2..79a701a282 100644 --- a/src/esi/Expression.h +++ b/src/esi/Expression.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Include.cc b/src/esi/Include.cc index af738c4bc4..1dc93481e9 100644 --- a/src/esi/Include.cc +++ b/src/esi/Include.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -80,7 +80,7 @@ esiBufferRecipient (clientStreamNode *node, ClientHttpRequest *http, HttpReply * assert (receivedData.length <= sizeof(esiStream->localbuffer->buf)); assert (!esiStream->finished); - debugs (86,5, HERE << "rep " << rep << " body " << receivedData.data << " len " << receivedData.length); + debugs (86,5, "rep " << rep << " body " << receivedData.data << " len " << receivedData.length); assert (node->readBuffer.offset == receivedData.offset || receivedData.length == 0); /* trivial case */ @@ -128,7 +128,7 @@ esiBufferRecipient (clientStreamNode *node, ClientHttpRequest *http, HttpReply * /* EOF / Read error / aborted entry */ if (rep == NULL && receivedData.data == NULL && receivedData.length == 0) { /* TODO: get stream status to test the entry for aborts */ - debugs(86, 5, HERE << "Finished reading upstream data in subrequest"); + debugs(86, 5, "Finished reading upstream data in subrequest"); esiStream->include->subRequestDone (esiStream, true); esiStream->finished = 1; httpRequestFree (http); @@ -171,7 +171,7 @@ esiBufferRecipient (clientStreamNode *node, ClientHttpRequest *http, HttpReply * tempBuffer.data = esiStream->buffer->buf; /* now just read into 'buffer' */ clientStreamRead (node, http, tempBuffer); - debugs(86, 5, HERE << "Requested more data for ESI subrequest"); + debugs(86, 5, "Requested more data for ESI subrequest"); } break; @@ -513,14 +513,14 @@ ESIInclude::subRequestDone (ESIStreamContext::Pointer stream, bool success) */ if (parent.getRaw() == NULL) { debugs(86, DBG_CRITICAL, "ERROR: Squid Bug #951: ESIInclude::subRequestDone: Sub request completed " - "after finish() called and parent unlinked. Unable to " - "continue handling the request, and may be memory leaking. " - "See http://www.squid-cache.org/bugs/show_bug.cgi?id=951 - we " - "are looking for a reproducible test case. This will require " - "an ESI template with includes, probably with alt-options, " - "and we're likely to need traffic dumps to allow us to " - "reconstruct the exact tcp handling sequences to trigger this " - "rather elusive bug."); + "after finish() called and parent unlinked. Unable to " + "continue handling the request, and may be memory leaking. " + "See http://www.squid-cache.org/bugs/show_bug.cgi?id=951 - we " + "are looking for a reproducible test case. This will require " + "an ESI template with includes, probably with alt-options, " + "and we're likely to need traffic dumps to allow us to " + "reconstruct the exact tcp handling sequences to trigger this " + "rather elusive bug."); return; } assert (parent.getRaw()); diff --git a/src/esi/Include.h b/src/esi/Include.h index 3c4d1f8f13..5d157ec968 100644 --- a/src/esi/Include.h +++ b/src/esi/Include.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Libxml2Parser.cc b/src/esi/Libxml2Parser.cc index 9a42144f4d..5d16520f31 100644 --- a/src/esi/Libxml2Parser.cc +++ b/src/esi/Libxml2Parser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Libxml2Parser.h b/src/esi/Libxml2Parser.h index b9a6eea6e8..01e6059676 100644 --- a/src/esi/Libxml2Parser.h +++ b/src/esi/Libxml2Parser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Literal.h b/src/esi/Literal.h index d4c401b00a..33cc7f55a1 100644 --- a/src/esi/Literal.h +++ b/src/esi/Literal.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Makefile.am b/src/esi/Makefile.am index eb6ecd1798..c8a37bb7ab 100644 --- a/src/esi/Makefile.am +++ b/src/esi/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/esi/Parser.cc b/src/esi/Parser.cc index b923b79d6e..773827e449 100644 --- a/src/esi/Parser.cc +++ b/src/esi/Parser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Parser.h b/src/esi/Parser.h index 9054f75757..acac12920c 100644 --- a/src/esi/Parser.h +++ b/src/esi/Parser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Segment.cc b/src/esi/Segment.cc index 315f22f024..7101b573e4 100644 --- a/src/esi/Segment.cc +++ b/src/esi/Segment.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Segment.h b/src/esi/Segment.h index 74c61b1df5..47dcca0dc9 100644 --- a/src/esi/Segment.h +++ b/src/esi/Segment.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Sequence.cc b/src/esi/Sequence.cc index 2960688e9f..74ffa61d40 100644 --- a/src/esi/Sequence.cc +++ b/src/esi/Sequence.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Sequence.h b/src/esi/Sequence.h index b2cf20ce46..89f72f2449 100644 --- a/src/esi/Sequence.h +++ b/src/esi/Sequence.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/Var.h b/src/esi/Var.h index 87132024e9..bb823ff774 100644 --- a/src/esi/Var.h +++ b/src/esi/Var.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/esi/VarState.cc b/src/esi/VarState.cc index d268b8c660..739e7c0b3c 100644 --- a/src/esi/VarState.cc +++ b/src/esi/VarState.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -28,7 +28,7 @@ char const * esiBrowsers[]= {"MSIE", CBDATA_CLASS_INIT(ESIVarState); void -ESIVarState::Variable::eval(ESIVarState &state, char const * , char const *found_default) const +ESIVarState::Variable::eval(ESIVarState &state, char const *, char const *found_default) const { /* No-op. We swallow it */ diff --git a/src/esi/VarState.h b/src/esi/VarState.h index 508653ae64..6417bdb644 100644 --- a/src/esi/VarState.h +++ b/src/esi/VarState.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/eui/Config.cc b/src/eui/Config.cc index ff21cb370e..703d5fa09c 100644 --- a/src/eui/Config.cc +++ b/src/eui/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/eui/Config.h b/src/eui/Config.h index 9c0d885367..b1de997958 100644 --- a/src/eui/Config.h +++ b/src/eui/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/eui/Eui48.cc b/src/eui/Eui48.cc index 8d528c3ab7..f64e8a69e2 100644 --- a/src/eui/Eui48.cc +++ b/src/eui/Eui48.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/eui/Eui48.h b/src/eui/Eui48.h index 837186160d..9aab5bbb7b 100644 --- a/src/eui/Eui48.h +++ b/src/eui/Eui48.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/eui/Eui64.cc b/src/eui/Eui64.cc index 653f48c4cb..d513af7a0e 100644 --- a/src/eui/Eui64.cc +++ b/src/eui/Eui64.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/eui/Eui64.h b/src/eui/Eui64.h index 393b76386c..1a720a9cc3 100644 --- a/src/eui/Eui64.h +++ b/src/eui/Eui64.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/eui/Makefile.am b/src/eui/Makefile.am index 21b591bc93..0857d19849 100644 --- a/src/eui/Makefile.am +++ b/src/eui/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/event.cc b/src/event.cc index f8e74f97c1..a344b12f49 100644 --- a/src/event.cc +++ b/src/event.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -315,7 +315,7 @@ EventScheduler::schedule(const char *name, EVH * func, void *arg, double when, i ev_entry *event = new ev_entry(name, func, arg, timestamp, weight, cbdata); ev_entry **E; - debugs(41, 7, HERE << "schedule: Adding '" << name << "', in " << when << " seconds"); + debugs(41, 7, "schedule: Adding '" << name << "', in " << when << " seconds"); /* Insert after the last event with the same or earlier time */ for (E = &tasks; *E; E = &(*E)->next) { diff --git a/src/event.h b/src/event.h index cf7c061ada..2e81d0095a 100644 --- a/src/event.h +++ b/src/event.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/external_acl.cc b/src/external_acl.cc index 70a9092133..01bd3bdb70 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -598,7 +598,7 @@ copyResultsFromEntry(HttpRequest *req, const ExternalACLEntryPointer &entry) static Acl::Answer aclMatchExternal(external_acl_data *acl, ACLFilledChecklist *ch) { - debugs(82, 9, HERE << "acl=\"" << acl->def->name << "\""); + debugs(82, 9, "acl=\"" << acl->def->name << "\""); ExternalACLEntryPointer entry = ch->extacl_entry; external_acl_message = "MISSING REQUIRED INFORMATION"; @@ -627,17 +627,17 @@ aclMatchExternal(external_acl_data *acl, ACLFilledChecklist *ch) } if (!entry) { - debugs(82, 9, HERE << "No helper entry available"); + debugs(82, 9, "No helper entry available"); #if USE_AUTH if (acl->def->require_auth) { /* Make sure the user is authenticated */ - debugs(82, 3, HERE << acl->def->name << " check user authenticated."); + debugs(82, 3, acl->def->name << " check user authenticated."); const auto ti = AuthenticateAcl(ch); if (!ti.allowed()) { - debugs(82, 2, HERE << acl->def->name << " user not authenticated (" << ti << ")"); + debugs(82, 2, acl->def->name << " user not authenticated (" << ti << ")"); return ti; } - debugs(82, 3, HERE << acl->def->name << " user is authenticated."); + debugs(82, 3, acl->def->name << " user is authenticated."); } #endif const char *key = makeExternalAclKey(ch, acl); @@ -656,19 +656,19 @@ aclMatchExternal(external_acl_data *acl, ACLFilledChecklist *ch) if (entry != NULL && external_acl_grace_expired(acl->def, entry)) { // refresh in the background ExternalACLLookup::Start(ch, acl, true); - debugs(82, 4, HERE << "no need to wait for the refresh of '" << + debugs(82, 4, "no need to wait for the refresh of '" << key << "' in '" << acl->def->name << "' (ch=" << ch << ")."); } if (!entry) { - debugs(82, 2, HERE << acl->def->name << "(\"" << key << "\") = lookup needed"); + debugs(82, 2, acl->def->name << "(\"" << key << "\") = lookup needed"); // TODO: All other helpers allow temporary overload. Should not we? if (!acl->def->theHelper->willOverload()) { - debugs(82, 2, HERE << "\"" << key << "\": queueing a call."); + debugs(82, 2, "\"" << key << "\": queueing a call."); if (!ch->goAsync(ExternalACLLookup::Instance())) debugs(82, 2, "\"" << key << "\": no async support!"); - debugs(82, 2, HERE << "\"" << key << "\": return -1."); + debugs(82, 2, "\"" << key << "\": return -1."); return ACCESS_DUNNO; // expired cached or simply absent entry } else { if (!staleEntry) { @@ -686,19 +686,19 @@ aclMatchExternal(external_acl_data *acl, ACLFilledChecklist *ch) } } - debugs(82, 4, HERE << "entry = { date=" << + debugs(82, 4, "entry = { date=" << (long unsigned int) entry->date << ", result=" << entry->result << " tag=" << entry->tag << " log=" << entry->log << " }"); #if USE_AUTH - debugs(82, 4, HERE << "entry user=" << entry->user); + debugs(82, 4, "entry user=" << entry->user); #endif external_acl_cache_touch(acl->def, entry); external_acl_message = entry->message.termedBuf(); - debugs(82, 2, HERE << acl->def->name << " = " << entry->result); + debugs(82, 2, acl->def->name << " = " << entry->result); copyResultsFromEntry(ch->request, entry); return entry->result; } @@ -848,7 +848,7 @@ external_acl_cache_add(external_acl * def, const char *key, ExternalACLEntryData ExternalACLEntryPointer entry; if (!def->maybeCacheable(data.result)) { - debugs(82,6, HERE); + debugs(82,6, MYNAME); if (data.result == ACCESS_DUNNO) { if (const ExternalACLEntryPointer oldentry = static_cast(hash_lookup(def->cache, key))) @@ -956,7 +956,7 @@ externalAclHandleReply(void *data, const Helper::Reply &reply) externalAclState *next; ExternalACLEntryData entryData; - debugs(82, 2, HERE << "reply=" << reply); + debugs(82, 2, "reply=" << reply); if (reply.result == Helper::Okay) entryData.result = ACCESS_ALLOWED; @@ -1028,7 +1028,7 @@ ExternalACLLookup::Start(ACLChecklist *checklist, external_acl_data *acl, bool i const char *key = makeExternalAclKey(ch, acl); assert(key); // XXX: will fail if EXT_ACL_IDENT case needs an async lookup - debugs(82, 2, HERE << (inBackground ? "bg" : "fg") << " lookup in '" << + debugs(82, 2, (inBackground ? "bg" : "fg") << " lookup in '" << def->name << "' for '" << key << "'"); /* Check for a pending lookup to hook into */ @@ -1048,7 +1048,7 @@ ExternalACLLookup::Start(ACLChecklist *checklist, external_acl_data *acl, bool i // A background refresh has no need to piggiback on a pending request: // When the pending request completes, the cache will be refreshed anyway. if (oldstate && inBackground) { - debugs(82, 7, HERE << "'" << def->name << "' queue is already being refreshed (ch=" << ch << ")"); + debugs(82, 7, "'" << def->name << "' queue is already being refreshed (ch=" << ch << ")"); return; } @@ -1072,7 +1072,7 @@ ExternalACLLookup::Start(ACLChecklist *checklist, external_acl_data *acl, bool i debugs(82, 4, "externalAclLookup: looking up for '" << key << "' in '" << def->name << "'."); if (!def->theHelper->trySubmit(buf.buf, externalAclHandleReply, state)) { - debugs(82, 7, HERE << "'" << def->name << "' submit to helper failed"); + debugs(82, 7, "'" << def->name << "' submit to helper failed"); assert(inBackground); // or the caller should have checked delete state; return; diff --git a/src/fatal.cc b/src/fatal.cc index d4401084b2..e2d539dec0 100644 --- a/src/fatal.cc +++ b/src/fatal.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fatal.h b/src/fatal.h index 46f0628153..292df722c9 100644 --- a/src/fatal.h +++ b/src/fatal.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fd.cc b/src/fd.cc index 1336501635..29951854ee 100644 --- a/src/fd.cc +++ b/src/fd.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fd.h b/src/fd.h index 8bbc549f7d..e3f1ba3618 100644 --- a/src/fd.h +++ b/src/fd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fde.cc b/src/fde.cc index 48cf3a5de9..dda30ab8cf 100644 --- a/src/fde.cc +++ b/src/fde.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fde.h b/src/fde.h index e269b7df3b..39930bb108 100644 --- a/src/fde.h +++ b/src/fde.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/filemap.cc b/src/filemap.cc index 8c90a530e6..f4f9b1d2ab 100644 --- a/src/filemap.cc +++ b/src/filemap.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -36,7 +36,7 @@ FileMap::FileMap() : capacity_(FM_INITIAL_NUMBER), usedSlots_(0), nwords(capacity_ >> LONG_BIT_SHIFT) { - debugs(8, 3, HERE << "creating space for " << capacity_ << " files"); + debugs(8, 3, "creating space for " << capacity_ << " files"); debugs(8, 5, "--> " << nwords << " words of " << sizeof(*bitmap) << " bytes each"); bitmap = (unsigned long *)xcalloc(nwords, sizeof(*bitmap)); } @@ -49,7 +49,7 @@ FileMap::grow() capacity_ <<= 1; assert(capacity_ <= (1 << 24)); /* swap_filen is 25 bits, signed */ nwords = capacity_ >> LONG_BIT_SHIFT; - debugs(8, 3, HERE << " creating space for " << capacity_ << " files"); + debugs(8, 3, " creating space for " << capacity_ << " files"); debugs(8, 5, "--> " << nwords << " words of " << sizeof(*bitmap) << " bytes each"); bitmap = (unsigned long *)xcalloc(nwords, sizeof(*bitmap)); debugs(8, 3, "copying " << old_sz << " old bytes"); diff --git a/src/format/ByteCode.h b/src/format/ByteCode.h index 5042a279e9..9a7da3ae1e 100644 --- a/src/format/ByteCode.h +++ b/src/format/ByteCode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/format/Config.cc b/src/format/Config.cc index e1b6a968e4..5ed3df9eb7 100644 --- a/src/format/Config.cc +++ b/src/format/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/format/Config.h b/src/format/Config.h index a8e0a10fa4..017e0ee092 100644 --- a/src/format/Config.h +++ b/src/format/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/format/Format.cc b/src/format/Format.cc index 08c3ba2fe7..968fb235a4 100644 --- a/src/format/Format.cc +++ b/src/format/Format.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -69,7 +69,7 @@ Format::Format::parse(const char *def) Token *new_lt, *last_lt; enum Quoting quote = LOG_QUOTE_NONE; - debugs(46, 2, HERE << "got definition '" << def << "'"); + debugs(46, 2, "got definition '" << def << "'"); if (format) { debugs(46, DBG_IMPORTANT, "WARNING: existing format for '" << name << " " << def << "'"); @@ -116,11 +116,11 @@ Format::AssembleOne(const char *token, MemBuf &mb, const AccessLogEntryPointer & void Format::Format::dump(StoreEntry * entry, const char *directiveName, bool eol) const { - debugs(46, 4, HERE); + debugs(46, 4, MYNAME); // loop rather than recursing to conserve stack space. for (const Format *fmt = this; fmt; fmt = fmt->next) { - debugs(46, 3, HERE << "Dumping format definition for " << fmt->name); + debugs(46, 3, "Dumping format definition for " << fmt->name); if (directiveName) storeAppendPrintf(entry, "%s %s ", directiveName, fmt->name); diff --git a/src/format/Format.h b/src/format/Format.h index 9f4408adde..ecf463ca9a 100644 --- a/src/format/Format.h +++ b/src/format/Format.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/format/Makefile.am b/src/format/Makefile.am index c86c338203..d78cd3b24d 100644 --- a/src/format/Makefile.am +++ b/src/format/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/format/Quoting.cc b/src/format/Quoting.cc index 73bd35d38d..d338001693 100644 --- a/src/format/Quoting.cc +++ b/src/format/Quoting.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/format/Quoting.h b/src/format/Quoting.h index ec1cc556a2..739dcd0fe7 100644 --- a/src/format/Quoting.h +++ b/src/format/Quoting.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/format/Token.cc b/src/format/Token.cc index 9d50af9042..67d9eed5dd 100644 --- a/src/format/Token.cc +++ b/src/format/Token.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -272,11 +272,11 @@ const char * Format::Token::scanForToken(TokenTableEntry const table[], const char *cur) { for (TokenTableEntry const *lte = table; lte->configTag != NULL; ++lte) { - debugs(46, 8, HERE << "compare tokens '" << lte->configTag << "' with '" << cur << "'"); + debugs(46, 8, "compare tokens '" << lte->configTag << "' with '" << cur << "'"); if (strncmp(lte->configTag, cur, strlen(lte->configTag)) == 0) { type = lte->tokenType; label = lte->configTag; - debugs(46, 7, HERE << "Found token '" << label << "'"); + debugs(46, 7, "Found token '" << label << "'"); return cur + strlen(lte->configTag); } } @@ -434,16 +434,16 @@ Format::Token::parse(const char *def, Quoting *quoting) // mistakes made with overlapping names. (Bug 3310) // Scan for various long tokens - debugs(46, 5, HERE << "scan for possible Misc token"); + debugs(46, 5, "scan for possible Misc token"); cur = scanForToken(TokenTableMisc, cur); // scan for 2-char tokens if (type == LFT_NONE) { - debugs(46, 5, HERE << "scan for possible 2C token"); + debugs(46, 5, "scan for possible 2C token"); cur = scanForToken(TokenTable2C, cur); } // finally scan for 1-char tokens. if (type == LFT_NONE) { - debugs(46, 5, HERE << "scan for possible 1C token"); + debugs(46, 5, "scan for possible 1C token"); cur = scanForToken(TokenTable1C, cur); } } diff --git a/src/format/Token.h b/src/format/Token.h index b525e9cda2..1fe7914d79 100644 --- a/src/format/Token.h +++ b/src/format/Token.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/format/TokenTableEntry.h b/src/format/TokenTableEntry.h index 7ca519e08d..7ce9318539 100644 --- a/src/format/TokenTableEntry.h +++ b/src/format/TokenTableEntry.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fqdncache.cc b/src/fqdncache.cc index ba0bccbd95..59422b755a 100644 --- a/src/fqdncache.cc +++ b/src/fqdncache.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fqdncache.h b/src/fqdncache.h index 941c065e37..b5df1133b6 100644 --- a/src/fqdncache.h +++ b/src/fqdncache.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index a6161f34d5..9f19d02d9b 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/fs/Module.cc b/src/fs/Module.cc index 1dc2857bc1..45b98601da 100644 --- a/src/fs/Module.cc +++ b/src/fs/Module.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/Module.h b/src/fs/Module.h index 139138f9f2..dcb51dd179 100644 --- a/src/fs/Module.h +++ b/src/fs/Module.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/aufs/StoreFSaufs.cc b/src/fs/aufs/StoreFSaufs.cc index f0b0a6980e..9d604611c5 100644 --- a/src/fs/aufs/StoreFSaufs.cc +++ b/src/fs/aufs/StoreFSaufs.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/diskd/StoreFSdiskd.cc b/src/fs/diskd/StoreFSdiskd.cc index dfc14fab49..09567dab2d 100644 --- a/src/fs/diskd/StoreFSdiskd.cc +++ b/src/fs/diskd/StoreFSdiskd.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockDbCell.cc b/src/fs/rock/RockDbCell.cc index 65e551fead..589429bca6 100644 --- a/src/fs/rock/RockDbCell.cc +++ b/src/fs/rock/RockDbCell.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockDbCell.h b/src/fs/rock/RockDbCell.h index 601d4ded7a..13ee89e23e 100644 --- a/src/fs/rock/RockDbCell.h +++ b/src/fs/rock/RockDbCell.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockHeaderUpdater.cc b/src/fs/rock/RockHeaderUpdater.cc index 3e134ecb0f..5750d3a9f1 100644 --- a/src/fs/rock/RockHeaderUpdater.cc +++ b/src/fs/rock/RockHeaderUpdater.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockHeaderUpdater.h b/src/fs/rock/RockHeaderUpdater.h index 0d2744d92a..e02342f6a8 100644 --- a/src/fs/rock/RockHeaderUpdater.h +++ b/src/fs/rock/RockHeaderUpdater.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockIoRequests.cc b/src/fs/rock/RockIoRequests.cc index cb1d23c550..d7aa429bcd 100644 --- a/src/fs/rock/RockIoRequests.cc +++ b/src/fs/rock/RockIoRequests.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockIoRequests.h b/src/fs/rock/RockIoRequests.h index 0a3816cb37..c3656413b3 100644 --- a/src/fs/rock/RockIoRequests.h +++ b/src/fs/rock/RockIoRequests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockIoState.cc b/src/fs/rock/RockIoState.cc index 63a2199547..ed2feaba1e 100644 --- a/src/fs/rock/RockIoState.cc +++ b/src/fs/rock/RockIoState.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -301,7 +301,7 @@ Rock::IoState::writeToDisk() memcpy(wBuf, theBuf.mem, theBuf.size); const uint64_t diskOffset = dir->diskOffset(sidCurrent); - debugs(79, 5, HERE << swap_filen << " at " << diskOffset << '+' << + debugs(79, 5, swap_filen << " at " << diskOffset << '+' << theBuf.size); const auto id = ++requestsSent; WriteRequest *const r = new WriteRequest( @@ -453,7 +453,7 @@ private: void Rock::IoState::callBack(int errflag) { - debugs(79,3, HERE << "errflag=" << errflag); + debugs(79,3, "errflag=" << errflag); theFile = NULL; AsyncCall::Pointer call = asyncCall(79,3, "SomeIoStateCloseCb", diff --git a/src/fs/rock/RockIoState.h b/src/fs/rock/RockIoState.h index d87c3aa9ac..e84c766a5e 100644 --- a/src/fs/rock/RockIoState.h +++ b/src/fs/rock/RockIoState.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc index c8e641b190..c7c72293e1 100644 --- a/src/fs/rock/RockRebuild.cc +++ b/src/fs/rock/RockRebuild.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -441,7 +441,7 @@ Rock::Rebuild::loadingSteps() getCurrentTime(); const double elapsedMsec = tvSubMsec(loopStart, current_time); if (elapsedMsec > maxSpentMsec || elapsedMsec < 0) { - debugs(47, 5, HERE << "pausing after " << loaded << " entries in " << + debugs(47, 5, "pausing after " << loaded << " entries in " << elapsedMsec << "ms; " << (elapsedMsec/loaded) << "ms per entry"); break; } @@ -668,7 +668,7 @@ Rock::Rebuild::freeBadEntry(const sfileno fileno, const char *eDescription) void Rock::Rebuild::swanSong() { - debugs(47,3, HERE << "cache_dir #" << sd->index << " rebuild level: " << + debugs(47,3, "cache_dir #" << sd->index << " rebuild level: " << StoreController::store_dirs_rebuilding); storeRebuildComplete(&counts); } diff --git a/src/fs/rock/RockRebuild.h b/src/fs/rock/RockRebuild.h index 12d7960d77..b5f2bfed7a 100644 --- a/src/fs/rock/RockRebuild.h +++ b/src/fs/rock/RockRebuild.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockStoreFileSystem.cc b/src/fs/rock/RockStoreFileSystem.cc index d1da71c2bd..e3b4bd5762 100644 --- a/src/fs/rock/RockStoreFileSystem.cc +++ b/src/fs/rock/RockStoreFileSystem.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -47,7 +47,7 @@ Rock::StoreFileSystem::registerWithCacheManager() void Rock::StoreFileSystem::setup() { - debugs(92,2, HERE << "Will use Rock FS"); + debugs(92,2, "Will use Rock FS"); } void diff --git a/src/fs/rock/RockStoreFileSystem.h b/src/fs/rock/RockStoreFileSystem.h index 1ce7d91005..61492891bf 100644 --- a/src/fs/rock/RockStoreFileSystem.h +++ b/src/fs/rock/RockStoreFileSystem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc index 96fcf95fee..ccd5a5c44e 100644 --- a/src/fs/rock/RockSwapDir.cc +++ b/src/fs/rock/RockSwapDir.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -215,11 +215,11 @@ Rock::SwapDir::create() assert(filePath); if (UsingSmp() && !IamDiskProcess()) { - debugs (47,3, HERE << "disker will create in " << path); + debugs (47,3, "disker will create in " << path); return; } - debugs (47,3, HERE << "creating in " << path); + debugs (47,3, "creating in " << path); struct stat dir_sb; if (::stat(path, &dir_sb) == 0) { @@ -280,7 +280,7 @@ Rock::SwapDir::createError(const char *const msg) void Rock::SwapDir::init() { - debugs(47,2, HERE); + debugs(47,2, MYNAME); // XXX: SwapDirs aren't refcounted. We make IORequestor calls, which // are refcounted. We up our count once to avoid implicit delete's. @@ -294,7 +294,7 @@ Rock::SwapDir::init() const char *ioModule = needsDiskStrand() ? "IpcIo" : "Blocking"; if (DiskIOModule *m = DiskIOModule::Find(ioModule)) { - debugs(47,2, HERE << "Using DiskIO module: " << ioModule); + debugs(47,2, "Using DiskIO module: " << ioModule); io = m->createStrategy(); io->init(); } else { @@ -598,7 +598,7 @@ Rock::SwapDir::canStore(const StoreEntry &e, int64_t diskSpaceNeeded, int &load) // TODO: reserve page instead if (needsDiskStrand() && Ipc::Mem::PageLevel(Ipc::Mem::PageId::ioPage) >= 0.9 * Ipc::Mem::PageLimit(Ipc::Mem::PageId::ioPage)) { - debugs(47, 5, HERE << "too few shared pages for IPC I/O left"); + debugs(47, 5, "too few shared pages for IPC I/O left"); return false; } @@ -613,7 +613,7 @@ StoreIOState::Pointer Rock::SwapDir::createStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreIOState::STIOCB *cbIo, void *data) { if (!theFile || theFile->error()) { - debugs(47,4, HERE << theFile); + debugs(47,4, theFile); return NULL; } @@ -621,7 +621,7 @@ Rock::SwapDir::createStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreI Ipc::StoreMapAnchor *const slot = map->openForWriting(reinterpret_cast(e.key), filen); if (!slot) { - debugs(47, 5, HERE << "map->add failed"); + debugs(47, 5, "map->add failed"); return NULL; } @@ -638,7 +638,7 @@ Rock::SwapDir::createStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreI sio->swap_filen = filen; sio->writeableAnchor_ = slot; - debugs(47,5, HERE << "dir " << index << " created new filen " << + debugs(47,5, "dir " << index << " created new filen " << std::setfill('0') << std::hex << std::uppercase << std::setw(8) << sio->swap_filen << std::dec << " starting at " << diskOffset(sio->swap_filen)); @@ -756,12 +756,12 @@ StoreIOState::Pointer Rock::SwapDir::openStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreIOState::STIOCB *cbIo, void *data) { if (!theFile || theFile->error()) { - debugs(47,4, HERE << theFile); + debugs(47,4, theFile); return NULL; } if (!e.hasDisk()) { - debugs(47,4, HERE << e); + debugs(47,4, e); return NULL; } @@ -769,7 +769,7 @@ Rock::SwapDir::openStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreIOS // TODO: reserve page instead if (needsDiskStrand() && Ipc::Mem::PageLevel(Ipc::Mem::PageId::ioPage) >= 0.9 * Ipc::Mem::PageLimit(Ipc::Mem::PageId::ioPage)) { - debugs(47, 5, HERE << "too few shared pages for IPC I/O left"); + debugs(47, 5, "too few shared pages for IPC I/O left"); return NULL; } @@ -788,7 +788,7 @@ Rock::SwapDir::openStoreIO(StoreEntry &e, StoreIOState::STFNCB *cbFile, StoreIOS sio->readableAnchor_ = slot; sio->file(theFile); - debugs(47,5, HERE << "dir " << index << " has old filen: " << + debugs(47,5, "dir " << index << " has old filen: " << std::setfill('0') << std::hex << std::uppercase << std::setw(8) << sio->swap_filen); @@ -978,7 +978,7 @@ Rock::SwapDir::maintain() void Rock::SwapDir::reference(StoreEntry &e) { - debugs(47, 5, HERE << &e << ' ' << e.swap_dirn << ' ' << e.swap_filen); + debugs(47, 5, &e << ' ' << e.swap_dirn << ' ' << e.swap_filen); if (repl && repl->Referenced) repl->Referenced(repl, &e, &e.repl); } @@ -986,7 +986,7 @@ Rock::SwapDir::reference(StoreEntry &e) bool Rock::SwapDir::dereference(StoreEntry &e) { - debugs(47, 5, HERE << &e << ' ' << e.swap_dirn << ' ' << e.swap_filen); + debugs(47, 5, &e << ' ' << e.swap_dirn << ' ' << e.swap_filen); if (repl && repl->Dereferenced) repl->Dereferenced(repl, &e, &e.repl); @@ -1025,7 +1025,7 @@ Rock::SwapDir::evictCached(StoreEntry &e) void Rock::SwapDir::trackReferences(StoreEntry &e) { - debugs(47, 5, HERE << e); + debugs(47, 5, e); if (repl) repl->Add(repl, &e, &e.repl); } @@ -1033,7 +1033,7 @@ Rock::SwapDir::trackReferences(StoreEntry &e) void Rock::SwapDir::ignoreReferences(StoreEntry &e) { - debugs(47, 5, HERE << e); + debugs(47, 5, e); if (repl) repl->Remove(repl, &e, &e.repl); } diff --git a/src/fs/rock/RockSwapDir.h b/src/fs/rock/RockSwapDir.h index d8486346b6..d0acea59a1 100644 --- a/src/fs/rock/RockSwapDir.h +++ b/src/fs/rock/RockSwapDir.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/rock/forward.h b/src/fs/rock/forward.h index f55ed2008e..716593d0aa 100644 --- a/src/fs/rock/forward.h +++ b/src/fs/rock/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/RebuildState.cc b/src/fs/ufs/RebuildState.cc index 975a8ce918..14834f29a8 100644 --- a/src/fs/ufs/RebuildState.cc +++ b/src/fs/ufs/RebuildState.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -132,7 +132,7 @@ Fs::Ufs::RebuildState::rebuildStep() getCurrentTime(); const double elapsedMsec = tvSubMsec(loopStart, current_time); if (elapsedMsec > maxSpentMsec || elapsedMsec < 0) { - debugs(47, 5, HERE << "pausing after " << n_read << " entries in " << + debugs(47, 5, "pausing after " << n_read << " entries in " << elapsedMsec << "ms; " << (elapsedMsec/n_read) << "ms per entry"); break; } @@ -147,7 +147,7 @@ Fs::Ufs::RebuildState::rebuildFromDirectory() struct stat sb; int fd = -1; - debugs(47, 3, HERE << "DIR #" << sd->index); + debugs(47, 3, "DIR #" << sd->index); assert(fd == -1); sfileno filn = 0; @@ -299,7 +299,7 @@ Fs::Ufs::RebuildState::rebuildFromSwapLog() */ swapData.swap_filen &= 0x00FFFFFF; - debugs(47, 3, HERE << swap_log_op_str[(int) swapData.op] << " " << + debugs(47, 3, swap_log_op_str[(int) swapData.op] << " " << storeKeyText(swapData.key) << " "<< std::setfill('0') << std::hex << std::uppercase << std::setw(8) << swapData.swap_filen); @@ -358,7 +358,7 @@ Fs::Ufs::RebuildState::getNextFile(sfileno * filn_p, int *) { int fd = -1; int dirs_opened = 0; - debugs(47, 3, HERE << "flag=" << flags.init << ", " << + debugs(47, 3, "flag=" << flags.init << ", " << sd->index << ": /"<< std::setfill('0') << std::hex << std::uppercase << std::setw(2) << curlvl1 << "/" << std::setw(2) << curlvl2); @@ -399,8 +399,8 @@ Fs::Ufs::RebuildState::getNextFile(sfileno * filn_p, int *) entry = readdir(td); if (entry == NULL && errno == ENOENT) - debugs(47, DBG_IMPORTANT, HERE << "WARNING: directory does not exist!"); - debugs(47, 3, HERE << "Directory " << fullpath); + debugs(47, DBG_IMPORTANT, "WARNING: directory does not exist!"); + debugs(47, 3, "Directory " << fullpath); } } @@ -408,12 +408,12 @@ Fs::Ufs::RebuildState::getNextFile(sfileno * filn_p, int *) ++in_dir; if (sscanf(entry->d_name, "%x", &fn) != 1) { - debugs(47, 3, HERE << "invalid entry " << entry->d_name); + debugs(47, 3, "invalid entry " << entry->d_name); continue; } if (!UFSSwapDir::FilenoBelongsHere(fn, sd->index, curlvl1, curlvl2)) { - debugs(47, 3, HERE << std::setfill('0') << + debugs(47, 3, std::setfill('0') << std::hex << std::uppercase << std::setw(8) << fn << " does not belong in " << std::dec << sd->index << "/" << curlvl1 << "/" << curlvl2); @@ -422,13 +422,13 @@ Fs::Ufs::RebuildState::getNextFile(sfileno * filn_p, int *) } if (sd->mapBitTest(fn)) { - debugs(47, 3, HERE << "Locked, continuing with next."); + debugs(47, 3, "Locked, continuing with next."); continue; } snprintf(fullfilename, sizeof(fullfilename), "%s/%s", fullpath, entry->d_name); - debugs(47, 3, HERE << "Opening " << fullfilename); + debugs(47, 3, "Opening " << fullfilename); fd = file_open(fullfilename, O_RDONLY | O_BINARY); if (fd < 0) { diff --git a/src/fs/ufs/RebuildState.h b/src/fs/ufs/RebuildState.h index dd7fe2a0f2..d9c6f918f0 100644 --- a/src/fs/ufs/RebuildState.h +++ b/src/fs/ufs/RebuildState.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/StoreFSufs.cc b/src/fs/ufs/StoreFSufs.cc index fa4e9e5516..43d62dafa9 100644 --- a/src/fs/ufs/StoreFSufs.cc +++ b/src/fs/ufs/StoreFSufs.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/StoreFSufs.h b/src/fs/ufs/StoreFSufs.h index 2e0eab4d8e..a121cb0518 100644 --- a/src/fs/ufs/StoreFSufs.h +++ b/src/fs/ufs/StoreFSufs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/StoreSearchUFS.cc b/src/fs/ufs/StoreSearchUFS.cc index cf17c7db00..4af55d79b5 100644 --- a/src/fs/ufs/StoreSearchUFS.cc +++ b/src/fs/ufs/StoreSearchUFS.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/StoreSearchUFS.h b/src/fs/ufs/StoreSearchUFS.h index 43c1355c68..af4eeca196 100644 --- a/src/fs/ufs/StoreSearchUFS.h +++ b/src/fs/ufs/StoreSearchUFS.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/UFSStoreState.cc b/src/fs/ufs/UFSStoreState.cc index 16dd0f7a06..130b1f6924 100644 --- a/src/fs/ufs/UFSStoreState.cc +++ b/src/fs/ufs/UFSStoreState.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -64,7 +64,7 @@ void Fs::Ufs::UFSStoreState::openDone() { if (closing) - debugs(0, DBG_CRITICAL, HERE << "already closing in openDone()!?"); + debugs(0, DBG_CRITICAL, "already closing in openDone()!?"); if (theFile->error()) { tryClosing(); @@ -95,7 +95,7 @@ Fs::Ufs::UFSStoreState::closeCompleted() theFile->error()); if (theFile->error()) { - debugs(79,3,HERE<< "theFile->error() ret " << theFile->error()); + debugs(79,3, "theFile->error() ret " << theFile->error()); doCloseCallback(DISK_ERROR); } else { doCloseCallback(DISK_OK); @@ -163,7 +163,7 @@ Fs::Ufs::UFSStoreState::write(char const *buf, size_t size, off_t aOffset, FREE if (theFile->error()) { debugs(79, DBG_IMPORTANT, "ERROR: avoid write on theFile with error"); - debugs(79, DBG_IMPORTANT,HERE << "calling free_func for " << (void*) buf); + debugs(79, DBG_IMPORTANT, "calling free_func for " << (void*) buf); free_func((void*)buf); return false; } @@ -272,7 +272,7 @@ Fs::Ufs::UFSStoreState::readCompleted(const char *buf, int len, int, RefCount) { - debugs(79, 3, HERE << "dirno " << swap_dirn << ", fileno " << + debugs(79, 3, "dirno " << swap_dirn << ", fileno " << std::setfill('0') << std::hex << std::uppercase << std::setw(8) << swap_filen << ", len " << len); /* @@ -284,7 +284,7 @@ Fs::Ufs::UFSStoreState::writeCompleted(int, size_t len, RefCount) offset_ += len; if (theFile->error()) { - debugs(79,2,HERE << " detected an error, will try to close"); + debugs(79,2, " detected an error, will try to close"); tryClosing(); } @@ -429,13 +429,13 @@ Fs::Ufs::UFSStoreState::drainWriteQueue() void Fs::Ufs::UFSStoreState::tryClosing() { - debugs(79,3,HERE << this << " tryClosing()" << + debugs(79,3, this << " tryClosing()" << " closing = " << closing << " flags.try_closing = " << flags.try_closing << " ioInProgress = " << theFile->ioInProgress()); if (theFile->ioInProgress()) { - debugs(79, 3, HERE << this << + debugs(79, 3, this << " won't close since ioInProgress is true, bailing"); flags.try_closing = true; return; diff --git a/src/fs/ufs/UFSStoreState.h b/src/fs/ufs/UFSStoreState.h index 6bdcb7cbf3..eb2458bac2 100644 --- a/src/fs/ufs/UFSStoreState.h +++ b/src/fs/ufs/UFSStoreState.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/UFSStrategy.cc b/src/fs/ufs/UFSStrategy.cc index cf0b47eb63..9253d08c92 100644 --- a/src/fs/ufs/UFSStrategy.cc +++ b/src/fs/ufs/UFSStrategy.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -58,7 +58,7 @@ Fs::Ufs::UFSStrategy::open(SwapDir * SD, StoreEntry * e, StoreIOState::STFNCB *, StoreIOState::STIOCB * aCallback, void *callback_data) { assert (((UFSSwapDir *)SD)->IO == this); - debugs(79, 3, HERE << "fileno "<< std::setfill('0') << std::hex + debugs(79, 3, "fileno "<< std::setfill('0') << std::hex << std::uppercase << std::setw(8) << e->swap_filen); /* to consider: make createstate a private UFSStrategy call */ @@ -96,7 +96,7 @@ Fs::Ufs::UFSStrategy::create(SwapDir * SD, StoreEntry * e, StoreIOState::STFNCB assert (((UFSSwapDir *)SD)->IO == this); /* Allocate a number */ sfileno filn = ((UFSSwapDir *)SD)->mapBitAllocate(); - debugs(79, 3, HERE << "fileno "<< std::setfill('0') << + debugs(79, 3, "fileno "<< std::setfill('0') << std::hex << std::uppercase << std::setw(8) << filn); /* Shouldn't we handle a 'bitmap full' error here? */ diff --git a/src/fs/ufs/UFSStrategy.h b/src/fs/ufs/UFSStrategy.h index 56609a5872..a933236919 100644 --- a/src/fs/ufs/UFSStrategy.h +++ b/src/fs/ufs/UFSStrategy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc index a1857d03e4..3c11962149 100644 --- a/src/fs/ufs/UFSSwapDir.cc +++ b/src/fs/ufs/UFSSwapDir.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -272,7 +272,7 @@ Fs::Ufs::UFSSwapDir::getOptionTree() const void Fs::Ufs::UFSSwapDir::init() { - debugs(47, 3, HERE << "Initialising UFS SwapDir engine."); + debugs(47, 3, "Initialising UFS SwapDir engine."); /* Parsing must be finished by now - force to NULL, don't delete */ currentIOOptions = NULL; static int started_clean_event = 0; @@ -341,8 +341,8 @@ Fs::Ufs::UFSSwapDir::~UFSSwapDir() void Fs::Ufs::UFSSwapDir::dumpEntry(StoreEntry &e) const { - debugs(47, DBG_CRITICAL, HERE << "FILENO "<< std::setfill('0') << std::hex << std::uppercase << std::setw(8) << e.swap_filen); - debugs(47, DBG_CRITICAL, HERE << "PATH " << fullPath(e.swap_filen, NULL) ); + debugs(47, DBG_CRITICAL, "FILENO "<< std::setfill('0') << std::hex << std::uppercase << std::setw(8) << e.swap_filen); + debugs(47, DBG_CRITICAL, "PATH " << fullPath(e.swap_filen, NULL) ); e.dump(0); } @@ -353,13 +353,13 @@ Fs::Ufs::UFSSwapDir::doubleCheck(StoreEntry & e) struct stat sb; if (::stat(fullPath(e.swap_filen, NULL), &sb) < 0) { - debugs(47, DBG_CRITICAL, HERE << "WARNING: Missing swap file"); + debugs(47, DBG_CRITICAL, "WARNING: Missing swap file"); dumpEntry(e); return true; } if ((off_t)e.swap_file_sz != sb.st_size) { - debugs(47, DBG_CRITICAL, HERE << "WARNING: Size Mismatch. Entry size: " + debugs(47, DBG_CRITICAL, "WARNING: Size Mismatch. Entry size: " << e.swap_file_sz << ", file size: " << sb.st_size); dumpEntry(e); return true; @@ -524,7 +524,7 @@ Fs::Ufs::UFSSwapDir::maintain() void Fs::Ufs::UFSSwapDir::reference(StoreEntry &e) { - debugs(47, 3, HERE << "referencing " << &e << " " << + debugs(47, 3, "referencing " << &e << " " << e.swap_dirn << "/" << e.swap_filen); if (repl->Referenced) @@ -534,7 +534,7 @@ Fs::Ufs::UFSSwapDir::reference(StoreEntry &e) bool Fs::Ufs::UFSSwapDir::dereference(StoreEntry & e) { - debugs(47, 3, HERE << "dereferencing " << &e << " " << + debugs(47, 3, "dereferencing " << &e << " " << e.swap_dirn << "/" << e.swap_filen); if (repl->Dereferenced) @@ -749,7 +749,7 @@ Fs::Ufs::UFSSwapDir::openLog() fatal("UFSSwapDir::openLog: Failed to open swap log."); } - debugs(50, 3, HERE << "Cache Dir #" << index << " log opened on FD " << swaplog_fd); + debugs(50, 3, "Cache Dir #" << index << " log opened on FD " << swaplog_fd); } void @@ -798,7 +798,7 @@ Fs::Ufs::UFSSwapDir::addDiskRestore(const cache_key * key, int) { StoreEntry *e = NULL; - debugs(47, 5, HERE << storeKeyText(key) << + debugs(47, 5, storeKeyText(key) << ", fileno="<< std::setfill('0') << std::hex << std::uppercase << std::setw(8) << file_number); /* if you call this you'd better be sure file_number is not * already in use! */ @@ -962,7 +962,7 @@ Fs::Ufs::UFSSwapDir::writeCleanStart() state->walker = repl->WalkInit(repl); ::unlink(state->cln.c_str()); - debugs(47, 3, HERE << "opened " << state->newLog << ", FD " << state->fd); + debugs(47, 3, "opened " << state->newLog << ", FD " << state->fd); #if HAVE_FCHMOD if (::stat(state->cur.c_str(), &sb) == 0) @@ -1163,7 +1163,7 @@ Fs::Ufs::UFSSwapDir::validFileno(sfileno filn, int flag) const void Fs::Ufs::UFSSwapDir::unlinkFile(sfileno f) { - debugs(79, 3, HERE << "unlinking fileno " << std::setfill('0') << + debugs(79, 3, "unlinking fileno " << std::setfill('0') << std::hex << std::uppercase << std::setw(8) << f << " '" << fullPath(f,NULL) << "'"); /* commonUfsDirMapBitReset(this, f); */ @@ -1209,7 +1209,7 @@ Fs::Ufs::UFSSwapDir::evictIfFound(const cache_key *) void Fs::Ufs::UFSSwapDir::replacementAdd(StoreEntry * e) { - debugs(47, 4, HERE << "added node " << e << " to dir " << index); + debugs(47, 4, "added node " << e << " to dir " << index); repl->Add(repl, e, &e->repl); } @@ -1222,7 +1222,7 @@ Fs::Ufs::UFSSwapDir::replacementRemove(StoreEntry * e) assert (dynamic_cast(SD.getRaw()) == this); - debugs(47, 4, HERE << "remove node " << e << " from dir " << index); + debugs(47, 4, "remove node " << e << " from dir " << index); repl->Remove(repl, e, &e->repl); } @@ -1334,7 +1334,7 @@ Fs::Ufs::UFSSwapDir::DirClean(int swap_index) SBuf p1; p1.appendf("%s/%02X/%02X", SD->path, D1, D2); - debugs(36, 3, HERE << "Cleaning directory " << p1); + debugs(36, 3, "Cleaning directory " << p1); dir_pointer = opendir(p1.c_str()); if (!dir_pointer) { @@ -1377,14 +1377,14 @@ Fs::Ufs::UFSSwapDir::DirClean(int swap_index) k = 10; for (n = 0; n < k; ++n) { - debugs(36, 3, HERE << "Cleaning file "<< std::setfill('0') << std::hex << std::uppercase << std::setw(8) << files[n]); + debugs(36, 3, "Cleaning file "<< std::setfill('0') << std::hex << std::uppercase << std::setw(8) << files[n]); SBuf p2(p1); p2.appendf("/%08X", files[n]); safeunlink(p2.c_str(), 0); ++statCounter.swap.files_cleaned; } - debugs(36, 3, HERE << "Cleaned " << k << " unused files from " << p1); + debugs(36, 3, "Cleaned " << k << " unused files from " << p1); return k; } diff --git a/src/fs/ufs/UFSSwapDir.h b/src/fs/ufs/UFSSwapDir.h index 059650ed89..8575b74c37 100644 --- a/src/fs/ufs/UFSSwapDir.h +++ b/src/fs/ufs/UFSSwapDir.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/UFSSwapLogParser.cc b/src/fs/ufs/UFSSwapLogParser.cc index db0554ebfa..de866b1f24 100644 --- a/src/fs/ufs/UFSSwapLogParser.cc +++ b/src/fs/ufs/UFSSwapLogParser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs/ufs/UFSSwapLogParser.h b/src/fs/ufs/UFSSwapLogParser.h index f0a5fac974..785b690761 100644 --- a/src/fs/ufs/UFSSwapLogParser.h +++ b/src/fs/ufs/UFSSwapLogParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs_io.cc b/src/fs_io.cc index b2fe18bae0..ec0d72c793 100644 --- a/src/fs_io.cc +++ b/src/fs_io.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/fs_io.h b/src/fs_io.h index d9ff0e8e8d..06b81c6701 100644 --- a/src/fs_io.h +++ b/src/fs_io.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ftp/Elements.cc b/src/ftp/Elements.cc index 400c5ab1d7..951e3c2806 100644 --- a/src/ftp/Elements.cc +++ b/src/ftp/Elements.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ftp/Elements.h b/src/ftp/Elements.h index 287e60f73a..42c1a277f8 100644 --- a/src/ftp/Elements.h +++ b/src/ftp/Elements.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ftp/Makefile.am b/src/ftp/Makefile.am index adb8a78848..1c69620f8a 100644 --- a/src/ftp/Makefile.am +++ b/src/ftp/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/ftp/Parsing.cc b/src/ftp/Parsing.cc index 5dee769111..52c3739697 100644 --- a/src/ftp/Parsing.cc +++ b/src/ftp/Parsing.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ftp/Parsing.h b/src/ftp/Parsing.h index 68d189c49e..a3b25a913b 100644 --- a/src/ftp/Parsing.h +++ b/src/ftp/Parsing.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/globals.h b/src/globals.h index be7c45cca9..8c8e948649 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/gopher.cc b/src/gopher.cc index da2d0c9df9..56c713886f 100644 --- a/src/gopher.cc +++ b/src/gopher.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -602,7 +602,7 @@ gopherToHTML(GopherStateData * gopherState, char *inbuf, int len) /* WWW link */ snprintf(tmpbuf, TEMP_BUF_SIZE, " %s\n", icon_url, host, rfc1738_escape_unescaped(selector + 5), html_quote(name)); - } else if (gtype == GOPHER_WWW) { + } else if (gtype == GOPHER_WWW) { snprintf(tmpbuf, TEMP_BUF_SIZE, " %s\n", icon_url, rfc1738_escape_unescaped(selector), html_quote(name)); } else { @@ -711,7 +711,7 @@ static void gopherTimeout(const CommTimeoutCbParams &io) { GopherStateData *gopherState = static_cast(io.data); - debugs(10, 4, HERE << io.conn << ": '" << gopherState->entry->url() << "'" ); + debugs(10, 4, io.conn << ": '" << gopherState->entry->url() << "'" ); gopherState->fwd->fail(new ErrorState(ERR_READ_TIMEOUT, Http::scGatewayTimeout, gopherState->fwd->request, gopherState->fwd->al)); @@ -766,7 +766,7 @@ gopherReadReply(const Comm::ConnectionPointer &conn, char *buf, size_t len, Comm statCounter.server.other.kbytes_in += len; } - debugs(10, 5, HERE << conn << " read len=" << len); + debugs(10, 5, conn << " read len=" << len); if (flag == Comm::OK && len > 0) { AsyncCall::Pointer nil; @@ -839,7 +839,7 @@ gopherSendComplete(const Comm::ConnectionPointer &conn, char *, size_t size, Com { GopherStateData *gopherState = (GopherStateData *) data; StoreEntry *entry = gopherState->entry; - debugs(10, 5, HERE << conn << " size: " << size << " errflag: " << errflag); + debugs(10, 5, conn << " size: " << size << " errflag: " << errflag); if (size > 0) { fd_bytes(conn->fd, size, FD_WRITE); diff --git a/src/gopher.h b/src/gopher.h index 1d73bac113..f63504bc6f 100644 --- a/src/gopher.h +++ b/src/gopher.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper.cc b/src/helper.cc index f4ab558acc..88efa264f5 100644 --- a/src/helper.cc +++ b/src/helper.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -1555,12 +1555,12 @@ helper_server::checkForTimedOutRequests(bool const retry) void helper_server::requestTimeout(const CommTimeoutCbParams &io) { - debugs(26, 3, HERE << io.conn); + debugs(26, 3, io.conn); helper_server *srv = static_cast(io.data); srv->checkForTimedOutRequests(srv->parent->retryTimedOut); - debugs(84, 3, HERE << io.conn << " establish new helper_server::requestTimeout"); + debugs(84, 3, io.conn << " establish new helper_server::requestTimeout"); AsyncCall::Pointer timeoutCall = commCbCall(84, 4, "helper_server::requestTimeout", CommTimeoutCbPtrFun(helper_server::requestTimeout, srv)); diff --git a/src/helper.h b/src/helper.h index 5e4bf6fedb..7738dc310a 100644 --- a/src/helper.h +++ b/src/helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/ChildConfig.cc b/src/helper/ChildConfig.cc index 3673ee866e..2b9f4bd030 100644 --- a/src/helper/ChildConfig.cc +++ b/src/helper/ChildConfig.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/ChildConfig.h b/src/helper/ChildConfig.h index c314dbb401..a330165b3f 100644 --- a/src/helper/ChildConfig.h +++ b/src/helper/ChildConfig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index 9756475388..b61305b7e6 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/helper/Reply.cc b/src/helper/Reply.cc index 1dcb610caa..b877b2d9ac 100644 --- a/src/helper/Reply.cc +++ b/src/helper/Reply.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/Reply.h b/src/helper/Reply.h index e953a6cbab..902051aeaa 100644 --- a/src/helper/Reply.h +++ b/src/helper/Reply.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/Request.h b/src/helper/Request.h index 62de480958..5e69f6bba4 100644 --- a/src/helper/Request.h +++ b/src/helper/Request.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/ReservationId.cc b/src/helper/ReservationId.cc index ab18f167e5..c2fd65c55d 100644 --- a/src/helper/ReservationId.cc +++ b/src/helper/ReservationId.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/ReservationId.h b/src/helper/ReservationId.h index 2cd6b11bdb..4eadf5bd73 100644 --- a/src/helper/ReservationId.h +++ b/src/helper/ReservationId.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/ResultCode.h b/src/helper/ResultCode.h index 4d732251ce..20cf01366a 100644 --- a/src/helper/ResultCode.h +++ b/src/helper/ResultCode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/forward.h b/src/helper/forward.h index 70136953c2..c0ff261a0b 100644 --- a/src/helper/forward.h +++ b/src/helper/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/helper/protocol_defines.h b/src/helper/protocol_defines.h index fadea94f8b..e36f2ae05e 100644 --- a/src/helper/protocol_defines.h +++ b/src/helper/protocol_defines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/hier_code.h b/src/hier_code.h index b95c7b1e12..b1dae2ad2c 100644 --- a/src/hier_code.h +++ b/src/hier_code.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/htcp.cc b/src/htcp.cc index d955761164..c9d050a52a 100644 --- a/src/htcp.cc +++ b/src/htcp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/htcp.h b/src/htcp.h index 1434cf89d0..578afd174d 100644 --- a/src/htcp.h +++ b/src/htcp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http.cc b/src/http.cc index 5fd8b24732..147056adc0 100644 --- a/src/http.cc +++ b/src/http.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -83,7 +83,7 @@ HttpStateData::HttpStateData(FwdState *theFwdState) : payloadTruncated(0), sawDateGoBack(false) { - debugs(11,5,HERE << "HttpStateData " << this << " created"); + debugs(11,5, "HttpStateData " << this << " created"); ignoreCacheControl = false; surrogateNoStore = false; serverConnection = fwd->serverConnection(); @@ -130,7 +130,7 @@ HttpStateData::~HttpStateData() delete upgradeHeaderOut; - debugs(11,5, HERE << "HttpStateData " << this << " destroyed; " << serverConnection); + debugs(11,5, "HttpStateData " << this << " destroyed; " << serverConnection); } const Comm::ConnectionPointer & @@ -395,12 +395,12 @@ HttpStateData::reusableReply(HttpStateData::ReuseDecision &decision) bool mayStore = false; // HTTPbis pt6 section 3.2: a response CC:public is present if (rep->cache_control->hasPublic()) { - debugs(22, 3, HERE << "Authenticated but server reply Cache-Control:public"); + debugs(22, 3, "Authenticated but server reply Cache-Control:public"); mayStore = true; // HTTPbis pt6 section 3.2: a response CC:must-revalidate is present } else if (rep->cache_control->hasMustRevalidate()) { - debugs(22, 3, HERE << "Authenticated but server reply Cache-Control:must-revalidate"); + debugs(22, 3, "Authenticated but server reply Cache-Control:must-revalidate"); mayStore = true; #if USE_HTTP_VIOLATIONS @@ -409,13 +409,13 @@ HttpStateData::reusableReply(HttpStateData::ReuseDecision &decision) // some. The caching+revalidate is not exactly unsafe though with Squids interpretation of no-cache // (without parameters) as equivalent to must-revalidate in the reply. } else if (rep->cache_control->hasNoCacheWithoutParameters()) { - debugs(22, 3, HERE << "Authenticated but server reply Cache-Control:no-cache (equivalent to must-revalidate)"); + debugs(22, 3, "Authenticated but server reply Cache-Control:no-cache (equivalent to must-revalidate)"); mayStore = true; #endif // HTTPbis pt6 section 3.2: a response CC:s-maxage is present } else if (rep->cache_control->hasSMaxAge()) { - debugs(22, 3, HERE << "Authenticated but server reply Cache-Control:s-maxage"); + debugs(22, 3, "Authenticated but server reply Cache-Control:s-maxage"); mayStore = true; } @@ -792,7 +792,7 @@ HttpStateData::handle1xx(HttpReply *reply) return drop1xx(reason); } - debugs(11, 2, HERE << "forwarding 1xx to client"); + debugs(11, 2, "forwarding 1xx to client"); // the Sink will use this to call us back after writing 1xx to the client typedef NullaryMemFunT CbDialer; @@ -1124,7 +1124,7 @@ HttpStateData::statusIfComplete() const HttpStateData::ConnectionStatus HttpStateData::persistentConnStatus() const { - debugs(11, 3, HERE << serverConnection << " eof=" << eof); + debugs(11, 3, serverConnection << " eof=" << eof); if (eof) // already reached EOF return COMPLETE_NONPERSISTENT_MSG; @@ -1282,7 +1282,7 @@ HttpStateData::processReply() { if (flags.handling1xx) { // we came back after handling a 1xx response - debugs(11, 5, HERE << "done with 1xx handling"); + debugs(11, 5, "done with 1xx handling"); flags.handling1xx = false; Must(!flags.headers_parsed); } @@ -1312,7 +1312,7 @@ bool HttpStateData::continueAfterParsingHeader() { if (flags.handling1xx) { - debugs(11, 5, HERE << "wait for 1xx handling"); + debugs(11, 5, "wait for 1xx handling"); Must(!flags.headers_parsed); return false; } @@ -1471,7 +1471,7 @@ HttpStateData::processReplyBody() } #if USE_ADAPTATION - debugs(11,5, HERE << "adaptationAccessCheckPending=" << adaptationAccessCheckPending); + debugs(11,5, "adaptationAccessCheckPending=" << adaptationAccessCheckPending); if (adaptationAccessCheckPending) return; @@ -1645,7 +1645,7 @@ HttpStateData::maybeMakeSpaceAvailable(bool doGrow) void HttpStateData::wroteLast(const CommIoCbParams &io) { - debugs(11, 5, HERE << serverConnection << ": size " << io.size << ": errflag " << io.flag << "."); + debugs(11, 5, serverConnection << ": size " << io.size << ": errflag " << io.flag << "."); #if URL_CHECKSUM_DEBUG entry->mem_obj->checkUrlChecksum(); @@ -1701,7 +1701,7 @@ HttpStateData::sendComplete() void HttpStateData::closeServer() { - debugs(11,5, HERE << "closing HTTP server " << serverConnection << " this " << this); + debugs(11,5, "closing HTTP server " << serverConnection << " this " << this); if (Comm::IsConnOpen(serverConnection)) { fwd->unregister(serverConnection); @@ -2339,10 +2339,10 @@ HttpStateData::sendRequest() { MemBuf mb; - debugs(11, 5, HERE << serverConnection << ", request " << request << ", this " << this << "."); + debugs(11, 5, serverConnection << ", request " << request << ", this " << this << "."); if (!Comm::IsConnOpen(serverConnection)) { - debugs(11,3, HERE << "cannot send request to closing " << serverConnection); + debugs(11,3, "cannot send request to closing " << serverConnection); assert(closeHandler != NULL); return false; } @@ -2487,7 +2487,7 @@ HttpStateData::finishingBrokenPost() { #if USE_HTTP_VIOLATIONS if (!Config.accessList.brokenPosts) { - debugs(11, 5, HERE << "No brokenPosts list"); + debugs(11, 5, "No brokenPosts list"); return false; } @@ -2495,12 +2495,12 @@ HttpStateData::finishingBrokenPost() ch.al = fwd->al; ch.syncAle(originalRequest().getRaw(), nullptr); if (!ch.fastCheck().allowed()) { - debugs(11, 5, HERE << "didn't match brokenPosts"); + debugs(11, 5, "didn't match brokenPosts"); return false; } if (!Comm::IsConnOpen(serverConnection)) { - debugs(11, 3, HERE << "ignoring broken POST for closed " << serverConnection); + debugs(11, 3, "ignoring broken POST for closed " << serverConnection); assert(closeHandler != NULL); return true; // prevent caller from proceeding as if nothing happened } @@ -2521,7 +2521,7 @@ bool HttpStateData::finishingChunkedRequest() { if (flags.sentLastChunk) { - debugs(11, 5, HERE << "already sent last-chunk"); + debugs(11, 5, "already sent last-chunk"); return false; } @@ -2538,7 +2538,7 @@ void HttpStateData::doneSendingRequestBody() { Client::doneSendingRequestBody(); - debugs(11,5, HERE << serverConnection); + debugs(11,5, serverConnection); // do we need to write something after the last body byte? if (flags.chunked_request && finishingChunkedRequest()) @@ -2557,7 +2557,7 @@ HttpStateData::handleMoreRequestBodyAvailable() // XXX: we should check this condition in other callbacks then! // TODO: Check whether this can actually happen: We should unsubscribe // as a body consumer when the above condition(s) are detected. - debugs(11, DBG_IMPORTANT, HERE << "Transaction aborted while reading HTTP body"); + debugs(11, DBG_IMPORTANT, "Transaction aborted while reading HTTP body"); return; } @@ -2614,7 +2614,7 @@ HttpStateData::sentRequestBody(const CommIoCbParams &io) void HttpStateData::abortAll(const char *reason) { - debugs(11,5, HERE << "aborting transaction for " << reason << + debugs(11,5, "aborting transaction for " << reason << "; " << serverConnection << ", this " << this); mustStop(reason); } diff --git a/src/http.h b/src/http.h index 55b441824a..e70cd7e037 100644 --- a/src/http.h +++ b/src/http.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/ContentLengthInterpreter.cc b/src/http/ContentLengthInterpreter.cc index af2fce8254..076afa8863 100644 --- a/src/http/ContentLengthInterpreter.cc +++ b/src/http/ContentLengthInterpreter.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/ContentLengthInterpreter.h b/src/http/ContentLengthInterpreter.h index fd005b26d3..35b146a912 100644 --- a/src/http/ContentLengthInterpreter.h +++ b/src/http/ContentLengthInterpreter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/Makefile.am b/src/http/Makefile.am index c476902c78..081dbd58c7 100644 --- a/src/http/Makefile.am +++ b/src/http/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/http/Message.cc b/src/http/Message.cc index ef5f72d013..230a33e743 100644 --- a/src/http/Message.cc +++ b/src/http/Message.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/Message.h b/src/http/Message.h index 7a61b64293..11a9312140 100644 --- a/src/http/Message.h +++ b/src/http/Message.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/MethodType.h b/src/http/MethodType.h index 7842ce156c..a8fdbd1921 100644 --- a/src/http/MethodType.h +++ b/src/http/MethodType.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/ProtocolVersion.h b/src/http/ProtocolVersion.h index 4c82a0258a..c6a03256ef 100644 --- a/src/http/ProtocolVersion.h +++ b/src/http/ProtocolVersion.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/RegisteredHeaders.cc b/src/http/RegisteredHeaders.cc index bbd0bc4119..94b0afc050 100644 --- a/src/http/RegisteredHeaders.cc +++ b/src/http/RegisteredHeaders.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/RegisteredHeaders.h b/src/http/RegisteredHeaders.h index e37bef99d5..b2a7c8d2d3 100644 --- a/src/http/RegisteredHeaders.h +++ b/src/http/RegisteredHeaders.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/RegisteredHeadersHash.cci b/src/http/RegisteredHeadersHash.cci index 123103479d..a89e9a6d9c 100644 --- a/src/http/RegisteredHeadersHash.cci +++ b/src/http/RegisteredHeadersHash.cci @@ -34,7 +34,7 @@ /* AUTO GENERATED FROM RegisteredHeadersHash.gperf. DO NOT EDIT */ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/RegisteredHeadersHash.gperf b/src/http/RegisteredHeadersHash.gperf index 7becf80c16..30b7f67171 100644 --- a/src/http/RegisteredHeadersHash.gperf +++ b/src/http/RegisteredHeadersHash.gperf @@ -2,7 +2,7 @@ /* AUTO GENERATED FROM RegisteredHeadersHash.gperf. DO NOT EDIT */ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/RequestMethod.cc b/src/http/RequestMethod.cc index e3d41545c7..3a8c887350 100644 --- a/src/http/RequestMethod.cc +++ b/src/http/RequestMethod.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/RequestMethod.h b/src/http/RequestMethod.h index 9169260c84..fe4a0bee98 100644 --- a/src/http/RequestMethod.h +++ b/src/http/RequestMethod.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/StateFlags.h b/src/http/StateFlags.h index 5905b3e238..a30de34b6e 100644 --- a/src/http/StateFlags.h +++ b/src/http/StateFlags.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/StatusCode.cc b/src/http/StatusCode.cc index c72c4995e5..2a9bde6019 100644 --- a/src/http/StatusCode.cc +++ b/src/http/StatusCode.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/StatusCode.h b/src/http/StatusCode.h index f33fbfe663..d9f3620a75 100644 --- a/src/http/StatusCode.h +++ b/src/http/StatusCode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/StatusLine.cc b/src/http/StatusLine.cc index bb2ed4e33d..911e4af479 100644 --- a/src/http/StatusLine.cc +++ b/src/http/StatusLine.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/StatusLine.h b/src/http/StatusLine.h index 03817826d8..d85281b094 100644 --- a/src/http/StatusLine.h +++ b/src/http/StatusLine.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/Stream.cc b/src/http/Stream.cc index d25416b86d..a07bdf8e20 100644 --- a/src/http/Stream.cc +++ b/src/http/Stream.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/Stream.h b/src/http/Stream.h index 232dad6955..d01c6f66ee 100644 --- a/src/http/Stream.h +++ b/src/http/Stream.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/forward.h b/src/http/forward.h index cb7f4c0bf2..a89090bb7d 100644 --- a/src/http/forward.h +++ b/src/http/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/Makefile.am b/src/http/one/Makefile.am index 49ece9a388..73d853532d 100644 --- a/src/http/one/Makefile.am +++ b/src/http/one/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/http/one/Parser.cc b/src/http/one/Parser.cc index 393552448d..8e62de4ee3 100644 --- a/src/http/one/Parser.cc +++ b/src/http/one/Parser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/Parser.h b/src/http/one/Parser.h index 96fae68642..7216401eb3 100644 --- a/src/http/one/Parser.h +++ b/src/http/one/Parser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/RequestParser.cc b/src/http/one/RequestParser.cc index 6c0bd4e493..3d7798ed21 100644 --- a/src/http/one/RequestParser.cc +++ b/src/http/one/RequestParser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/RequestParser.h b/src/http/one/RequestParser.h index 80cf6dc985..4992d1e9b7 100644 --- a/src/http/one/RequestParser.h +++ b/src/http/one/RequestParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/ResponseParser.cc b/src/http/one/ResponseParser.cc index a73a700229..8025d210ca 100644 --- a/src/http/one/ResponseParser.cc +++ b/src/http/one/ResponseParser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/ResponseParser.h b/src/http/one/ResponseParser.h index 6642c5b8c3..78c8a40eb2 100644 --- a/src/http/one/ResponseParser.h +++ b/src/http/one/ResponseParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/TeChunkedParser.cc b/src/http/one/TeChunkedParser.cc index 6d2f8ea995..132d4d0b8c 100644 --- a/src/http/one/TeChunkedParser.cc +++ b/src/http/one/TeChunkedParser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/TeChunkedParser.h b/src/http/one/TeChunkedParser.h index 2ca8988bbf..a01b701ac9 100644 --- a/src/http/one/TeChunkedParser.h +++ b/src/http/one/TeChunkedParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/Tokenizer.cc b/src/http/one/Tokenizer.cc index 3a6bef3fe9..0d54c0beaa 100644 --- a/src/http/one/Tokenizer.cc +++ b/src/http/one/Tokenizer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/Tokenizer.h b/src/http/one/Tokenizer.h index 2d40574b9c..75006aa42f 100644 --- a/src/http/one/Tokenizer.h +++ b/src/http/one/Tokenizer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/one/forward.h b/src/http/one/forward.h index 2b4ad28d27..20949bad86 100644 --- a/src/http/one/forward.h +++ b/src/http/one/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/LFS/Makefile.am b/src/http/url_rewriters/LFS/Makefile.am index fa2b28dd16..8aa2b4b92c 100644 --- a/src/http/url_rewriters/LFS/Makefile.am +++ b/src/http/url_rewriters/LFS/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/LFS/required.m4 b/src/http/url_rewriters/LFS/required.m4 index f450f83f26..eee28b6e2c 100644 --- a/src/http/url_rewriters/LFS/required.m4 +++ b/src/http/url_rewriters/LFS/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/LFS/rredir.cc b/src/http/url_rewriters/LFS/rredir.cc index 433601441f..dfc010b045 100644 --- a/src/http/url_rewriters/LFS/rredir.cc +++ b/src/http/url_rewriters/LFS/rredir.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/LFS/url_lfs_rewrite.pl.in b/src/http/url_rewriters/LFS/url_lfs_rewrite.pl.in index 3c2da0720c..499ddc5dd9 100755 --- a/src/http/url_rewriters/LFS/url_lfs_rewrite.pl.in +++ b/src/http/url_rewriters/LFS/url_lfs_rewrite.pl.in @@ -94,7 +94,7 @@ First Version: 26. May 1997 =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/Makefile.am b/src/http/url_rewriters/Makefile.am index 735886dbf8..66c2086582 100644 --- a/src/http/url_rewriters/Makefile.am +++ b/src/http/url_rewriters/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/fake/Makefile.am b/src/http/url_rewriters/fake/Makefile.am index 83f37e088f..4411878e50 100644 --- a/src/http/url_rewriters/fake/Makefile.am +++ b/src/http/url_rewriters/fake/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/fake/fake.cc b/src/http/url_rewriters/fake/fake.cc index 96213079d2..944556fb94 100644 --- a/src/http/url_rewriters/fake/fake.cc +++ b/src/http/url_rewriters/fake/fake.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/fake/required.m4 b/src/http/url_rewriters/fake/required.m4 index 19872bf5c8..62ba618cca 100755 --- a/src/http/url_rewriters/fake/required.m4 +++ b/src/http/url_rewriters/fake/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/fake/url_fake_rewrite.sh b/src/http/url_rewriters/fake/url_fake_rewrite.sh index 5f2372560c..a652e430f6 100755 --- a/src/http/url_rewriters/fake/url_fake_rewrite.sh +++ b/src/http/url_rewriters/fake/url_fake_rewrite.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/http/url_rewriters/helpers.m4 b/src/http/url_rewriters/helpers.m4 index c3476fa5b7..7923c58164 100644 --- a/src/http/url_rewriters/helpers.m4 +++ b/src/http/url_rewriters/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/icmp/Icmp.cc b/src/icmp/Icmp.cc index fe0c616ac9..ee36bb4bcc 100644 --- a/src/icmp/Icmp.cc +++ b/src/icmp/Icmp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/Icmp.h b/src/icmp/Icmp.h index ed187a0ef1..9a9cc3366d 100644 --- a/src/icmp/Icmp.h +++ b/src/icmp/Icmp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/Icmp4.cc b/src/icmp/Icmp4.cc index a357a56d4a..d4da232674 100644 --- a/src/icmp/Icmp4.cc +++ b/src/icmp/Icmp4.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -134,7 +134,7 @@ Icmp4::SendEcho(Ip::Address &to, int opcode, const char *payload, int len) ((sockaddr_in*)S->ai_addr)->sin_port = 0; assert(icmp_pktsize <= MAX_PKT4_SZ); - debugs(42, 5, HERE << "Send ICMP packet to " << to << "."); + debugs(42, 5, "Send ICMP packet to " << to << "."); x = sendto(icmp_sock, (const void *) pkt, @@ -166,7 +166,7 @@ Icmp4::Recv(void) static pingerReplyData preply; if (icmp_sock < 0) { - debugs(42, DBG_CRITICAL, HERE << "No socket! Recv() should not be called."); + debugs(42, DBG_CRITICAL, "No socket! Recv() should not be called."); return; } @@ -199,7 +199,7 @@ Icmp4::Recv(void) #endif - debugs(42, 8, HERE << n << " bytes from " << preply.from); + debugs(42, 8, n << " bytes from " << preply.from); ip = (struct iphdr *) (void *) pkt; diff --git a/src/icmp/Icmp4.h b/src/icmp/Icmp4.h index ec9c8aba01..458e3b23e0 100644 --- a/src/icmp/Icmp4.h +++ b/src/icmp/Icmp4.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/Icmp6.cc b/src/icmp/Icmp6.cc index 25c26122a5..727d3da1c1 100644 --- a/src/icmp/Icmp6.cc +++ b/src/icmp/Icmp6.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -170,7 +170,7 @@ Icmp6::SendEcho(Ip::Address &to, int opcode, const char *payload, int len) assert(icmp6_pktsize <= MAX_PKT6_SZ); - debugs(42, 5, HERE << "Send Icmp6 packet to " << to << "."); + debugs(42, 5, "Send Icmp6 packet to " << to << "."); x = sendto(icmp_sock, (const void *) pkt, @@ -183,7 +183,7 @@ Icmp6::SendEcho(Ip::Address &to, int opcode, const char *payload, int len) int xerrno = errno; debugs(42, DBG_IMPORTANT, MYNAME << "ERROR: sending to ICMPv6 packet to " << to << ": " << xstrerr(xerrno)); } - debugs(42,9, HERE << "x=" << x); + debugs(42,9, "x=" << x); Log(to, 0, NULL, 0, 0); Ip::Address::FreeAddr(S); @@ -205,7 +205,7 @@ Icmp6::Recv(void) static pingerReplyData preply; if (icmp_sock < 0) { - debugs(42, DBG_CRITICAL, HERE << "dropping ICMPv6 read. No socket!?"); + debugs(42, DBG_CRITICAL, "dropping ICMPv6 read. No socket!?"); return; } @@ -240,7 +240,7 @@ Icmp6::Recv(void) #endif - debugs(42, 8, HERE << n << " bytes from " << preply.from); + debugs(42, 8, n << " bytes from " << preply.from); // XXX: The IPv6 Header (ip6_hdr) is not available directly // @@ -261,7 +261,7 @@ Icmp6::Recv(void) ip = (struct ip6_hdr *) pkt; // += sizeof(ip6_hdr); - debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=" << ip->ip6_nxt << + debugs(42, DBG_CRITICAL, "ip6_nxt=" << ip->ip6_nxt << ", ip6_plen=" << ip->ip6_plen << ", ip6_hlim=" << ip->ip6_hlim << ", ip6_hops=" << ip->ip6_hops << @@ -281,7 +281,7 @@ Icmp6::Recv(void) break; default: - debugs(42, 8, HERE << preply.from << " said: " << icmp6header->icmp6_type << "/" << (int)icmp6header->icmp6_code << " " << + debugs(42, 8, preply.from << " said: " << icmp6header->icmp6_type << "/" << (int)icmp6header->icmp6_code << " " << IcmpPacketType(icmp6header->icmp6_type)); } Ip::Address::FreeAddr(from); @@ -289,7 +289,7 @@ Icmp6::Recv(void) } if (icmp6header->icmp6_id != icmp_ident) { - debugs(42, 8, HERE << "dropping Icmp6 read. IDENT check failed. ident=='" << icmp_ident << "'=='" << icmp6header->icmp6_id << "'"); + debugs(42, 8, "dropping Icmp6 read. IDENT check failed. ident=='" << icmp_ident << "'=='" << icmp6header->icmp6_id << "'"); Ip::Address::FreeAddr(from); return; } diff --git a/src/icmp/Icmp6.h b/src/icmp/Icmp6.h index a00bf92bd1..82fb06e99c 100644 --- a/src/icmp/Icmp6.h +++ b/src/icmp/Icmp6.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/IcmpConfig.cc b/src/icmp/IcmpConfig.cc index a619abc2c2..db1cf429a0 100644 --- a/src/icmp/IcmpConfig.cc +++ b/src/icmp/IcmpConfig.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/IcmpConfig.h b/src/icmp/IcmpConfig.h index 84c6e0f319..69aa7b9e7a 100644 --- a/src/icmp/IcmpConfig.h +++ b/src/icmp/IcmpConfig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/IcmpPinger.cc b/src/icmp/IcmpPinger.cc index 5dc30de060..989e756f37 100644 --- a/src/icmp/IcmpPinger.cc +++ b/src/icmp/IcmpPinger.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -186,14 +186,14 @@ IcmpPinger::Recv(void) guess_size = n - (sizeof(pingerEchoData) - PINGER_PAYLOAD_SZ); if (guess_size != pecho.psize) { - debugs(42, 2, HERE << "size mismatch, guess=" << guess_size << ", psize=" << pecho.psize); + debugs(42, 2, "size mismatch, guess=" << guess_size << ", psize=" << pecho.psize); /* don't process this message, but keep running */ return; } /* pass request for ICMPv6 handing */ if (pecho.to.isIPv6()) { - debugs(42, 2, HERE << " Pass " << pecho.to << " off to ICMPv6 module."); + debugs(42, 2, " Pass " << pecho.to << " off to ICMPv6 module."); icmp6.SendEcho(pecho.to, pecho.opcode, pecho.payload, @@ -202,7 +202,7 @@ IcmpPinger::Recv(void) /* pass the packet for ICMP handling */ else if (pecho.to.isIPv4()) { - debugs(42, 2, HERE << " Pass " << pecho.to << " off to ICMPv4 module."); + debugs(42, 2, " Pass " << pecho.to << " off to ICMPv4 module."); icmp4.SendEcho(pecho.to, pecho.opcode, pecho.payload, @@ -215,7 +215,7 @@ IcmpPinger::Recv(void) void IcmpPinger::SendResult(pingerReplyData &preply, int len) { - debugs(42, 2, HERE << "return result to squid. len=" << len); + debugs(42, 2, "return result to squid. len=" << len); if (send(socket_to_squid, &preply, len, 0) < 0) { int xerrno = errno; diff --git a/src/icmp/IcmpPinger.h b/src/icmp/IcmpPinger.h index 0650dd2c1a..624e7945d4 100644 --- a/src/icmp/IcmpPinger.h +++ b/src/icmp/IcmpPinger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/IcmpSquid.cc b/src/icmp/IcmpSquid.cc index 30ce8e92e0..c223881391 100644 --- a/src/icmp/IcmpSquid.cc +++ b/src/icmp/IcmpSquid.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -56,7 +56,7 @@ IcmpSquid::SendEcho(Ip::Address &to, int opcode, const char *payload, int len) /** \li Does nothing if the pinger socket is not available. */ if (icmp_sock < 0) { - debugs(37, 2, HERE << " Socket Closed. Aborted send to " << pecho.to << ", opcode " << opcode << ", len " << pecho.psize); + debugs(37, 2, " Socket Closed. Aborted send to " << pecho.to << ", opcode " << opcode << ", len " << pecho.psize); return; } @@ -86,7 +86,7 @@ IcmpSquid::SendEcho(Ip::Address &to, int opcode, const char *payload, int len) slen = sizeof(pingerEchoData) - PINGER_PAYLOAD_SZ + pecho.psize; - debugs(37, 2, HERE << "to " << pecho.to << ", opcode " << opcode << ", len " << pecho.psize); + debugs(37, 2, "to " << pecho.to << ", opcode " << opcode << ", len " << pecho.psize); x = comm_udp_send(icmp_sock, (char *)&pecho, slen, 0); @@ -102,7 +102,7 @@ IcmpSquid::SendEcho(Ip::Address &to, int opcode, const char *payload, int len) } /** All other send errors are ignored. */ } else if (x != slen) { - debugs(37, DBG_IMPORTANT, HERE << "Wrote " << x << " of " << slen << " bytes"); + debugs(37, DBG_IMPORTANT, "Wrote " << x << " of " << slen << " bytes"); } } @@ -158,11 +158,11 @@ IcmpSquid::Recv() switch (preply.opcode) { case S_ICMP_ECHO: - debugs(37,4, HERE << " ICMP_ECHO of " << preply.from << " gave: hops=" << preply.hops <<", rtt=" << preply.rtt); + debugs(37,4, " ICMP_ECHO of " << preply.from << " gave: hops=" << preply.hops <<", rtt=" << preply.rtt); break; case S_ICMP_DOM: - debugs(37,4, HERE << " DomainPing of " << preply.from << " gave: hops=" << preply.hops <<", rtt=" << preply.rtt); + debugs(37,4, " DomainPing of " << preply.from << " gave: hops=" << preply.hops <<", rtt=" << preply.rtt); netdbHandlePingReply(F, preply.hops, preply.rtt); break; @@ -178,7 +178,7 @@ void IcmpSquid::DomainPing(Ip::Address &to, const char *domain) { #if USE_ICMP - debugs(37, 4, HERE << "'" << domain << "' (" << to << ")"); + debugs(37, 4, "'" << domain << "' (" << to << ")"); SendEcho(to, S_ICMP_DOM, domain, 0); #else (void)to; @@ -232,7 +232,7 @@ IcmpSquid::Open(void) commUnsetFdTimeout(icmp_sock); - debugs(37, DBG_IMPORTANT, HERE << "Pinger socket opened on FD " << icmp_sock); + debugs(37, DBG_IMPORTANT, "Pinger socket opened on FD " << icmp_sock); /* Tests the pinger immediately using localhost */ if (Ip::EnableIpv6) @@ -242,7 +242,7 @@ IcmpSquid::Open(void) #if _SQUID_WINDOWS_ - debugs(37, 4, HERE << "Pinger handle: 0x" << std::hex << hIpc << std::dec << ", PID: " << pid); + debugs(37, 4, "Pinger handle: 0x" << std::hex << hIpc << std::dec << ", PID: " << pid); #endif /* _SQUID_WINDOWS_ */ return icmp_sock; @@ -259,7 +259,7 @@ IcmpSquid::Close(void) if (icmp_sock < 0) return; - debugs(37, DBG_IMPORTANT, HERE << "Closing Pinger socket on FD " << icmp_sock); + debugs(37, DBG_IMPORTANT, "Closing Pinger socket on FD " << icmp_sock); #if _SQUID_WINDOWS_ @@ -274,7 +274,7 @@ IcmpSquid::Close(void) if (hIpc) { if (WaitForSingleObject(hIpc, 12000) != WAIT_OBJECT_0) { getCurrentTime(); - debugs(37, DBG_CRITICAL, HERE << "WARNING: (pinger," << pid << ") didn't exit in 12 seconds"); + debugs(37, DBG_CRITICAL, "WARNING: (pinger," << pid << ") didn't exit in 12 seconds"); } CloseHandle(hIpc); diff --git a/src/icmp/IcmpSquid.h b/src/icmp/IcmpSquid.h index 0b69e3e47d..c28e84ca4c 100644 --- a/src/icmp/IcmpSquid.h +++ b/src/icmp/IcmpSquid.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am index 3b8d979d79..b38aff12fb 100644 --- a/src/icmp/Makefile.am +++ b/src/icmp/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc index 6512be0382..a6d9769f6c 100644 --- a/src/icmp/net_db.cc +++ b/src/icmp/net_db.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/net_db.h b/src/icmp/net_db.h index abbf6721a7..902dc7b97e 100644 --- a/src/icmp/net_db.h +++ b/src/icmp/net_db.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icmp/pinger.cc b/src/icmp/pinger.cc index 394bda4b36..90a007219d 100644 --- a/src/icmp/pinger.cc +++ b/src/icmp/pinger.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icp_opcode.h b/src/icp_opcode.h index 6b95a28e03..83540c78dc 100644 --- a/src/icp_opcode.h +++ b/src/icp_opcode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icp_v2.cc b/src/icp_v2.cc index dc5c343d54..6d2e8f33e2 100644 --- a/src/icp_v2.cc +++ b/src/icp_v2.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/icp_v3.cc b/src/icp_v3.cc index 7514198000..c8cd2f1373 100644 --- a/src/icp_v3.cc +++ b/src/icp_v3.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ident/AclIdent.cc b/src/ident/AclIdent.cc index 4fc0af1c50..0705fcfe9a 100644 --- a/src/ident/AclIdent.cc +++ b/src/ident/AclIdent.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -45,7 +45,7 @@ void ACLIdent::parse() { if (!data) { - debugs(28, 3, HERE << "current is null. Creating"); + debugs(28, 3, "current is null. Creating"); data = new ACLUserData; } @@ -102,7 +102,7 @@ IdentLookup::checkForAsync(ACLChecklist *cl)const const ConnStateData *conn = checklist->conn(); // check that ACLIdent::match() tested this lookup precondition assert(conn && Comm::IsConnOpen(conn->clientConnection)); - debugs(28, 3, HERE << "Doing ident lookup" ); + debugs(28, 3, "Doing ident lookup" ); Ident::Start(checklist->conn()->clientConnection, LookupDone, checklist); } diff --git a/src/ident/AclIdent.h b/src/ident/AclIdent.h index e45e74c9a9..23b694a0c3 100644 --- a/src/ident/AclIdent.h +++ b/src/ident/AclIdent.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ident/Config.h b/src/ident/Config.h index a77a0d5fb4..fbb019611c 100644 --- a/src/ident/Config.h +++ b/src/ident/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc index d887b29469..5ec7a7fac0 100644 --- a/src/ident/Ident.cc +++ b/src/ident/Ident.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -135,7 +135,7 @@ Ident::Close(const CommCloseCbParams ¶ms) void Ident::Timeout(const CommTimeoutCbParams &io) { - debugs(30, 3, HERE << io.conn); + debugs(30, 3, io.conn); IdentStateData *state = (IdentStateData *)io.data; state->deleteThis("timeout"); } @@ -193,11 +193,11 @@ Ident::ConnectDone(const Comm::ConnectionPointer &conn, Comm::Flag status, int, void Ident::WriteFeedback(const Comm::ConnectionPointer &conn, char *, size_t len, Comm::Flag flag, int xerrno, void *data) { - debugs(30, 5, HERE << conn << ": Wrote IDENT request " << len << " bytes."); + debugs(30, 5, conn << ": Wrote IDENT request " << len << " bytes."); // TODO handle write errors better. retry or abort? if (flag != Comm::OK) { - debugs(30, 2, HERE << conn << " err-flags=" << flag << " IDENT write error: " << xstrerr(xerrno)); + debugs(30, 2, conn << " err-flags=" << flag << " IDENT write error: " << xstrerr(xerrno)); IdentStateData *state = (IdentStateData *)data; state->deleteThis("write error"); } @@ -231,7 +231,7 @@ Ident::ReadReply(const Comm::ConnectionPointer &conn, char *buf, size_t len, Com if ((t = strchr(buf, '\n'))) *t = '\0'; - debugs(30, 5, HERE << conn << ": Read '" << buf << "'"); + debugs(30, 5, conn << ": Read '" << buf << "'"); if (strstr(buf, "USERID")) { if ((ident = strrchr(buf, ':'))) { diff --git a/src/ident/Ident.h b/src/ident/Ident.h index ae52d55ace..ea20314c6f 100644 --- a/src/ident/Ident.h +++ b/src/ident/Ident.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ident/Makefile.am b/src/ident/Makefile.am index 001ed761fb..63364b95fb 100644 --- a/src/ident/Makefile.am +++ b/src/ident/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/int.cc b/src/int.cc index 8d51e30829..a54132ccce 100644 --- a/src/int.cc +++ b/src/int.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/int.h b/src/int.h index b1f446e7e5..f7ac5c02d1 100644 --- a/src/int.h +++ b/src/int.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/internal.cc b/src/internal.cc index 6c9d837e28..3144b83780 100644 --- a/src/internal.cc +++ b/src/internal.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/internal.h b/src/internal.h index 18eace6161..bee9a394fa 100644 --- a/src/internal.h +++ b/src/internal.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ip/Address.cc b/src/ip/Address.cc index 7669c41b97..215b72e179 100644 --- a/src/ip/Address.cc +++ b/src/ip/Address.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -386,7 +386,7 @@ Ip::Address::lookupHostIP(const char *s, bool nodns) int err = 0; struct addrinfo *res = NULL; if ( (err = getaddrinfo(s, NULL, &want, &res)) != 0) { - debugs(14,3, HERE << "Given Non-IP '" << s << "': " << gai_strerror(err) ); + debugs(14,3, "Given Non-IP '" << s << "': " << gai_strerror(err) ); /* free the memory getaddrinfo() dynamically allocated. */ if (res) freeaddrinfo(res); diff --git a/src/ip/Address.h b/src/ip/Address.h index a83214f6c7..b0f352d8f3 100644 --- a/src/ip/Address.h +++ b/src/ip/Address.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ip/Intercept.cc b/src/ip/Intercept.cc index 6611ee179c..160978f4af 100644 --- a/src/ip/Intercept.cc +++ b/src/ip/Intercept.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -167,7 +167,7 @@ Ip::Intercept::TproxyTransparent(const Comm::ConnectionPointer &newConn) /* Trust the user configured properly. If not no harm done. * We will simply attempt a bind outgoing on our own IP. */ - debugs(89, 5, HERE << "address TPROXY: " << newConn); + debugs(89, 5, "address TPROXY: " << newConn); return true; #else (void)newConn; @@ -183,7 +183,7 @@ Ip::Intercept::IpfwInterception(const Comm::ConnectionPointer &newConn) * There is no way to identify whether they came from NAT or not. * Trust the user configured properly. */ - debugs(89, 5, HERE << "address NAT: " << newConn); + debugs(89, 5, "address NAT: " << newConn); return true; #else (void)newConn; @@ -282,7 +282,7 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionPointer &newConn) natfd = -1; } - debugs(89, 9, HERE << "address: " << newConn); + debugs(89, 9, "address: " << newConn); return false; } else { #if HAVE_STRUCT_NATLOOKUP_NL_REALIPADDR_IN6 @@ -294,7 +294,7 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionPointer &newConn) newConn->local = natLookup.nl_realip; #endif newConn->local.port(ntohs(natLookup.nl_realport)); - debugs(89, 5, HERE << "address NAT: " << newConn); + debugs(89, 5, "address NAT: " << newConn); return true; } @@ -316,7 +316,7 @@ Ip::Intercept::PfInterception(const Comm::ConnectionPointer &newConn) * * Trust the user configured properly. */ - debugs(89, 5, HERE << "address NAT divert-to: " << newConn); + debugs(89, 5, "address NAT divert-to: " << newConn); return true; #else /* USE_NAT_DEVPF / --with-nat-devpf */ @@ -358,7 +358,7 @@ Ip::Intercept::PfInterception(const Comm::ConnectionPointer &newConn) close(pffd); pffd = -1; } - debugs(89, 9, HERE << "address: " << newConn); + debugs(89, 9, "address: " << newConn); return false; } else { if (newConn->remote.isIPv6()) @@ -366,7 +366,7 @@ Ip::Intercept::PfInterception(const Comm::ConnectionPointer &newConn) else newConn->local = nl.rdaddr.v4; newConn->local.port(ntohs(nl.rdport)); - debugs(89, 5, HERE << "address NAT: " << newConn); + debugs(89, 5, "address NAT: " << newConn); return true; } #endif /* --with-nat-devpf */ @@ -385,7 +385,7 @@ Ip::Intercept::Lookup(const Comm::ConnectionPointer &newConn, const Comm::Connec /* --enable-pf-transparent */ #if IPF_TRANSPARENT || LINUX_NETFILTER || IPFW_TRANSPARENT || PF_TRANSPARENT - debugs(89, 5, HERE << "address BEGIN: me/client= " << newConn->local << ", destination/me= " << newConn->remote); + debugs(89, 5, "address BEGIN: me/client= " << newConn->local << ", destination/me= " << newConn->remote); newConn->flags |= (listenConn->flags & (COMM_TRANSPARENT|COMM_INTERCEPTION)); diff --git a/src/ip/Intercept.h b/src/ip/Intercept.h index 83c9556f2e..807b364267 100644 --- a/src/ip/Intercept.h +++ b/src/ip/Intercept.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am index cc9e158020..2b283bd72f 100644 --- a/src/ip/Makefile.am +++ b/src/ip/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/ip/NfMarkConfig.cc b/src/ip/NfMarkConfig.cc index cdc4c17cd9..2c8f8e41b7 100644 --- a/src/ip/NfMarkConfig.cc +++ b/src/ip/NfMarkConfig.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ip/NfMarkConfig.h b/src/ip/NfMarkConfig.h index 09411922ed..bbd5b7a130 100644 --- a/src/ip/NfMarkConfig.h +++ b/src/ip/NfMarkConfig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ip/QosConfig.cc b/src/ip/QosConfig.cc index cd6db5355a..7bc7c03c48 100644 --- a/src/ip/QosConfig.cc +++ b/src/ip/QosConfig.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h index 925585e769..4e6261c061 100644 --- a/src/ip/QosConfig.h +++ b/src/ip/QosConfig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ip/forward.h b/src/ip/forward.h index aaafef1f63..1044b55872 100644 --- a/src/ip/forward.h +++ b/src/ip/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ip/tools.cc b/src/ip/tools.cc index bdc9e26b17..cff35b1475 100644 --- a/src/ip/tools.cc +++ b/src/ip/tools.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ip/tools.h b/src/ip/tools.h index 4ef4ad381e..96f1cf8a3d 100644 --- a/src/ip/tools.h +++ b/src/ip/tools.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc.cc b/src/ipc.cc index d55c725652..7bcf43b789 100644 --- a/src/ipc.cc +++ b/src/ipc.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Coordinator.cc b/src/ipc/Coordinator.cc index bf4eb3d3b6..d7f1838fe5 100644 --- a/src/ipc/Coordinator.cc +++ b/src/ipc/Coordinator.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -53,7 +53,7 @@ Ipc::StrandCoord* Ipc::Coordinator::findStrand(int kidId) void Ipc::Coordinator::registerStrand(const StrandCoord& strand) { - debugs(54, 3, HERE << "registering kid" << strand.kidId << + debugs(54, 3, "registering kid" << strand.kidId << ' ' << strand.tag); if (StrandCoord* found = findStrand(strand.kidId)) { const String oldTag = found->tag; @@ -80,32 +80,32 @@ void Ipc::Coordinator::receive(const TypedMsgHdr& message) { switch (message.rawType()) { case mtRegisterStrand: - debugs(54, 6, HERE << "Registration request"); + debugs(54, 6, "Registration request"); handleRegistrationRequest(StrandMessage(message)); break; case mtFindStrand: { const StrandSearchRequest sr(message); - debugs(54, 6, HERE << "Strand search request: " << sr.requestorId << + debugs(54, 6, "Strand search request: " << sr.requestorId << " tag: " << sr.tag); handleSearchRequest(sr); break; } case mtSharedListenRequest: - debugs(54, 6, HERE << "Shared listen request"); + debugs(54, 6, "Shared listen request"); handleSharedListenRequest(SharedListenRequest(message)); break; case mtCacheMgrRequest: { - debugs(54, 6, HERE << "Cache manager request"); + debugs(54, 6, "Cache manager request"); const Mgr::Request req(message); handleCacheMgrRequest(req); } break; case mtCacheMgrResponse: { - debugs(54, 6, HERE << "Cache manager response"); + debugs(54, 6, "Cache manager response"); const Mgr::Response resp(message); handleCacheMgrResponse(Mine(resp)); } @@ -113,14 +113,14 @@ void Ipc::Coordinator::receive(const TypedMsgHdr& message) #if SQUID_SNMP case mtSnmpRequest: { - debugs(54, 6, HERE << "SNMP request"); + debugs(54, 6, "SNMP request"); const Snmp::Request req(message); handleSnmpRequest(req); } break; case mtSnmpResponse: { - debugs(54, 6, HERE << "SNMP response"); + debugs(54, 6, "SNMP response"); const Snmp::Response resp(message); handleSnmpResponse(Mine(resp)); } @@ -146,14 +146,14 @@ void Ipc::Coordinator::handleRegistrationRequest(const StrandMessage& msg) void Ipc::Coordinator::handleSharedListenRequest(const SharedListenRequest& request) { - debugs(54, 4, HERE << "kid" << request.requestorId << + debugs(54, 4, "kid" << request.requestorId << " needs shared listen FD for " << request.params.addr); Listeners::const_iterator i = listeners.find(request.params); int errNo = 0; const Comm::ConnectionPointer c = (i != listeners.end()) ? i->second : openListenSocket(request, errNo); - debugs(54, 3, HERE << "sending shared listen " << c << " for " << + debugs(54, 3, "sending shared listen " << c << " for " << request.params.addr << " to kid" << request.requestorId << " mapId=" << request.mapId); @@ -166,7 +166,7 @@ Ipc::Coordinator::handleSharedListenRequest(const SharedListenRequest& request) void Ipc::Coordinator::handleCacheMgrRequest(const Mgr::Request& request) { - debugs(54, 4, HERE); + debugs(54, 4, MYNAME); try { Mgr::Action::Pointer action = @@ -212,7 +212,7 @@ Ipc::Coordinator::handleSearchRequest(const Ipc::StrandSearchRequest &request) } searchers.push_back(request); - debugs(54, 3, HERE << "cannot yet tell kid" << request.requestorId << + debugs(54, 3, "cannot yet tell kid" << request.requestorId << " who " << request.tag << " is"); } @@ -220,7 +220,7 @@ void Ipc::Coordinator::notifySearcher(const Ipc::StrandSearchRequest &request, const StrandCoord& strand) { - debugs(54, 3, HERE << "tell kid" << request.requestorId << " that " << + debugs(54, 3, "tell kid" << request.requestorId << " that " << request.tag << " is kid" << strand.kidId); const StrandMessage response(strand, request.qid); TypedMsgHdr message; @@ -232,7 +232,7 @@ Ipc::Coordinator::notifySearcher(const Ipc::StrandSearchRequest &request, void Ipc::Coordinator::handleSnmpRequest(const Snmp::Request& request) { - debugs(54, 4, HERE); + debugs(54, 4, MYNAME); Snmp::Response response(request.requestId); TypedMsgHdr message; @@ -245,7 +245,7 @@ Ipc::Coordinator::handleSnmpRequest(const Snmp::Request& request) void Ipc::Coordinator::handleSnmpResponse(const Snmp::Response& response) { - debugs(54, 4, HERE); + debugs(54, 4, MYNAME); Snmp::Inquirer::HandleRemoteAck(response); } #endif @@ -256,7 +256,7 @@ Ipc::Coordinator::openListenSocket(const SharedListenRequest& request, { const OpenListenerParams &p = request.params; - debugs(54, 6, HERE << "opening listen FD at " << p.addr << " for kid" << + debugs(54, 6, "opening listen FD at " << p.addr << " for kid" << request.requestorId); Comm::ConnectionPointer newConn = new Comm::Connection; @@ -268,7 +268,7 @@ Ipc::Coordinator::openListenSocket(const SharedListenRequest& request, errNo = Comm::IsConnOpen(newConn) ? 0 : errno; leave_suid(); - debugs(54, 6, HERE << "tried listening on " << newConn << " for kid" << + debugs(54, 6, "tried listening on " << newConn << " for kid" << request.requestorId); // cache positive results @@ -282,7 +282,7 @@ void Ipc::Coordinator::broadcastSignal(int sig) const { typedef StrandCoords::const_iterator SCI; for (SCI iter = strands_.begin(); iter != strands_.end(); ++iter) { - debugs(54, 5, HERE << "signal " << sig << " to kid" << iter->kidId << + debugs(54, 5, "signal " << sig << " to kid" << iter->kidId << ", PID=" << iter->pid); kill(iter->pid, sig); } diff --git a/src/ipc/Coordinator.h b/src/ipc/Coordinator.h index 57f044b27e..8ec2e1c798 100644 --- a/src/ipc/Coordinator.h +++ b/src/ipc/Coordinator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/FdNotes.cc b/src/ipc/FdNotes.cc index 2b49932d46..1288b238f6 100644 --- a/src/ipc/FdNotes.cc +++ b/src/ipc/FdNotes.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/FdNotes.h b/src/ipc/FdNotes.h index e9792a2508..f4cb7546f3 100644 --- a/src/ipc/FdNotes.h +++ b/src/ipc/FdNotes.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Forwarder.cc b/src/ipc/Forwarder.cc index cae66bfcbc..6dea4caa92 100644 --- a/src/ipc/Forwarder.cc +++ b/src/ipc/Forwarder.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -41,7 +41,7 @@ Ipc::Forwarder::~Forwarder() void Ipc::Forwarder::start() { - debugs(54, 3, HERE); + debugs(54, 3, MYNAME); typedef NullaryMemFunT Dialer; AsyncCall::Pointer callback = JobCallback(54, 5, Dialer, this, Forwarder::handleRemoteAck); @@ -68,7 +68,7 @@ Ipc::Forwarder::start() void Ipc::Forwarder::swanSong() { - debugs(54, 5, HERE); + debugs(54, 5, MYNAME); removeTimeoutEvent(); if (request->requestId > 0) { DequeueRequest(request->requestId); @@ -79,7 +79,7 @@ Ipc::Forwarder::swanSong() bool Ipc::Forwarder::doneAll() const { - debugs(54, 5, HERE); + debugs(54, 5, MYNAME); return request->requestId == 0; } @@ -87,7 +87,7 @@ Ipc::Forwarder::doneAll() const void Ipc::Forwarder::handleRemoteAck() { - debugs(54, 3, HERE); + debugs(54, 3, MYNAME); request->requestId = 0; // Do not do entry->complete() because it will trigger our client side // processing when we no longer own the client-Squid connection. @@ -99,7 +99,7 @@ Ipc::Forwarder::handleRemoteAck() void Ipc::Forwarder::RequestTimedOut(void* param) { - debugs(54, 3, HERE); + debugs(54, 3, MYNAME); Must(param != NULL); Forwarder* fwdr = static_cast(param); // use async call to enable job call protection that time events lack @@ -113,7 +113,7 @@ Ipc::Forwarder::RequestTimedOut(void* param) void Ipc::Forwarder::requestTimedOut() { - debugs(54, 3, HERE); + debugs(54, 3, MYNAME); handleTimeout(); } @@ -133,7 +133,7 @@ Ipc::Forwarder::handleTimeout() void Ipc::Forwarder::handleException(const std::exception& e) { - debugs(54, 3, HERE << e.what()); + debugs(54, 3, e.what()); mustStop("exception"); } @@ -143,7 +143,7 @@ Ipc::Forwarder::callException(const std::exception& e) try { handleException(e); } catch (const std::exception& ex) { - debugs(54, DBG_CRITICAL, HERE << ex.what()); + debugs(54, DBG_CRITICAL, ex.what()); } AsyncJob::callException(e); } @@ -152,7 +152,7 @@ Ipc::Forwarder::callException(const std::exception& e) AsyncCall::Pointer Ipc::Forwarder::DequeueRequest(const RequestId::Index requestId) { - debugs(54, 3, HERE); + debugs(54, 3, MYNAME); Must(requestId != 0); AsyncCall::Pointer call; RequestsMap::iterator request = TheRequestsMap.find(requestId); @@ -175,7 +175,7 @@ Ipc::Forwarder::removeTimeoutEvent() void Ipc::Forwarder::HandleRemoteAck(const RequestId requestId) { - debugs(54, 3, HERE); + debugs(54, 3, MYNAME); Must(requestId != 0); AsyncCall::Pointer call = DequeueRequest(requestId); diff --git a/src/ipc/Forwarder.h b/src/ipc/Forwarder.h index ab1d056388..9d1c087c65 100644 --- a/src/ipc/Forwarder.h +++ b/src/ipc/Forwarder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Inquirer.cc b/src/ipc/Inquirer.cc index e5502efccb..a2b5a21d79 100644 --- a/src/ipc/Inquirer.cc +++ b/src/ipc/Inquirer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -36,7 +36,7 @@ Ipc::Inquirer::Inquirer(Request::Pointer aRequest, const StrandCoords& coords, codeContext(CodeContext::Current()), request(aRequest), strands(coords), pos(strands.begin()), timeout(aTimeout) { - debugs(54, 5, HERE); + debugs(54, 5, MYNAME); // order by ascending kid IDs; useful for non-aggregatable stats std::sort(strands.begin(), strands.end(), LesserStrandByKidId); @@ -44,7 +44,7 @@ Ipc::Inquirer::Inquirer(Request::Pointer aRequest, const StrandCoords& coords, Ipc::Inquirer::~Inquirer() { - debugs(54, 5, HERE); + debugs(54, 5, MYNAME); cleanup(); } @@ -74,7 +74,7 @@ Ipc::Inquirer::inquire() ++LastRequestId; request->requestId = LastRequestId; const int kidId = pos->kidId; - debugs(54, 4, HERE << "inquire kid: " << kidId << status()); + debugs(54, 4, "inquire kid: " << kidId << status()); TheRequestsMap[request->requestId] = callback; TypedMsgHdr message; request->pack(message); @@ -87,7 +87,7 @@ Ipc::Inquirer::inquire() void Ipc::Inquirer::handleRemoteAck(Response::Pointer response) { - debugs(54, 4, HERE << status()); + debugs(54, 4, status()); request->requestId = 0; removeTimeoutEvent(); if (aggregate(response)) { @@ -102,7 +102,7 @@ Ipc::Inquirer::handleRemoteAck(Response::Pointer response) void Ipc::Inquirer::swanSong() { - debugs(54, 5, HERE); + debugs(54, 5, MYNAME); removeTimeoutEvent(); if (request->requestId > 0) { DequeueRequest(request->requestId); @@ -121,18 +121,18 @@ Ipc::Inquirer::doneAll() const void Ipc::Inquirer::handleException(const std::exception& e) { - debugs(54, 3, HERE << e.what()); + debugs(54, 3, e.what()); mustStop("exception"); } void Ipc::Inquirer::callException(const std::exception& e) { - debugs(54, 3, HERE); + debugs(54, 3, MYNAME); try { handleException(e); } catch (const std::exception& ex) { - debugs(54, DBG_CRITICAL, HERE << ex.what()); + debugs(54, DBG_CRITICAL, ex.what()); } AsyncJob::callException(e); } @@ -141,7 +141,7 @@ Ipc::Inquirer::callException(const std::exception& e) AsyncCall::Pointer Ipc::Inquirer::DequeueRequest(const RequestId::Index requestId) { - debugs(54, 3, HERE << " requestId " << requestId); + debugs(54, 3, " requestId " << requestId); Must(requestId != 0); AsyncCall::Pointer call; RequestsMap::iterator request = TheRequestsMap.find(requestId); @@ -178,7 +178,7 @@ Ipc::Inquirer::removeTimeoutEvent() void Ipc::Inquirer::RequestTimedOut(void* param) { - debugs(54, 3, HERE); + debugs(54, 3, MYNAME); Must(param != NULL); Inquirer* cmi = static_cast(param); // use async call to enable job call protection that time events lack @@ -191,7 +191,7 @@ Ipc::Inquirer::RequestTimedOut(void* param) void Ipc::Inquirer::requestTimedOut() { - debugs(54, 3, HERE); + debugs(54, 3, MYNAME); if (request->requestId != 0) { DequeueRequest(request->requestId); request->requestId = 0; diff --git a/src/ipc/Inquirer.h b/src/ipc/Inquirer.h index fa4917b57f..8d279007e7 100644 --- a/src/ipc/Inquirer.h +++ b/src/ipc/Inquirer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Kid.cc b/src/ipc/Kid.cc index db64ce380b..8c3c7215c0 100644 --- a/src/ipc/Kid.cc +++ b/src/ipc/Kid.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Kid.h b/src/ipc/Kid.h index 19b8156083..01295f44c0 100644 --- a/src/ipc/Kid.h +++ b/src/ipc/Kid.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc index 725bead57c..6ec7d2dca8 100644 --- a/src/ipc/Kids.cc +++ b/src/ipc/Kids.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Kids.h b/src/ipc/Kids.h index 7468d6c559..8b28710789 100644 --- a/src/ipc/Kids.h +++ b/src/ipc/Kids.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am index 9646878f07..d331b03928 100644 --- a/src/ipc/Makefile.am +++ b/src/ipc/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/ipc/MemMap.cc b/src/ipc/MemMap.cc index 170746cccb..1ac45461db 100644 --- a/src/ipc/MemMap.cc +++ b/src/ipc/MemMap.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/MemMap.h b/src/ipc/MemMap.h index de9de7f818..70d161e50b 100644 --- a/src/ipc/MemMap.h +++ b/src/ipc/MemMap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Messages.h b/src/ipc/Messages.h index 3a04e02ddf..f341b3dd37 100644 --- a/src/ipc/Messages.h +++ b/src/ipc/Messages.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Port.cc b/src/ipc/Port.cc index 6125ae3dc6..05650d2fb9 100644 --- a/src/ipc/Port.cc +++ b/src/ipc/Port.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -36,7 +36,7 @@ void Ipc::Port::start() void Ipc::Port::doListen() { - debugs(54, 6, HERE); + debugs(54, 6, MYNAME); buf.prepForReading(); typedef CommCbMemFunT Dialer; AsyncCall::Pointer readHandler = JobCallback(54, 6, @@ -95,7 +95,7 @@ Ipc::Port::receiveOrIgnore(const TypedMsgHdr &message) void Ipc::Port::noteRead(const CommIoCbParams& params) { - debugs(54, 6, HERE << params.conn << " flag " << params.flag << + debugs(54, 6, params.conn << " flag " << params.flag << " [" << this << ']'); if (params.flag == Comm::OK) { assert(params.buf == buf.raw()); diff --git a/src/ipc/Port.h b/src/ipc/Port.h index 1124a7ce8e..87c233ed30 100644 --- a/src/ipc/Port.h +++ b/src/ipc/Port.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/QuestionerId.cc b/src/ipc/QuestionerId.cc index 10507dea9f..1476ee9cb1 100644 --- a/src/ipc/QuestionerId.cc +++ b/src/ipc/QuestionerId.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/QuestionerId.h b/src/ipc/QuestionerId.h index b9c74b92a4..7138548470 100644 --- a/src/ipc/QuestionerId.h +++ b/src/ipc/QuestionerId.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Queue.cc b/src/ipc/Queue.cc index 1fffc29908..f55ca0cb6b 100644 --- a/src/ipc/Queue.cc +++ b/src/ipc/Queue.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -47,7 +47,7 @@ InstanceIdDefinitions(Ipc::QueueReader, "ipcQR"); Ipc::QueueReader::QueueReader(): popBlocked(true), popSignal(false), rateLimit(0), balance(0) { - debugs(54, 7, HERE << "constructed " << id); + debugs(54, 7, "constructed " << id); } /* QueueReaders */ diff --git a/src/ipc/Queue.h b/src/ipc/Queue.h index f78577bdf0..379512427f 100644 --- a/src/ipc/Queue.h +++ b/src/ipc/Queue.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -540,7 +540,7 @@ BaseMultiQueue::pop(int &remoteProcessId, Value &value) OneToOneUniQueue &queue = inQueue(theLastPopProcessId); if (queue.pop(value, &localReader())) { remoteProcessId = theLastPopProcessId; - debugs(54, 7, HERE << "popped from " << remoteProcessId << " to " << theLocalProcessId << " at " << queue.size()); + debugs(54, 7, "popped from " << remoteProcessId << " to " << theLocalProcessId << " at " << queue.size()); return true; } } @@ -553,7 +553,7 @@ BaseMultiQueue::push(const int remoteProcessId, const Value &value) { OneToOneUniQueue &remoteQueue = outQueue(remoteProcessId); QueueReader &reader = remoteReader(remoteProcessId); - debugs(54, 7, HERE << "pushing from " << theLocalProcessId << " to " << remoteProcessId << " at " << remoteQueue.size()); + debugs(54, 7, "pushing from " << theLocalProcessId << " to " << remoteProcessId << " at " << remoteQueue.size()); return remoteQueue.push(value, &reader); } @@ -604,14 +604,14 @@ FewToFewBiQueue::findOldest(const int remoteProcessId, Value &value) const // we need the oldest value, so start with the incoming, them-to-us queue: const OneToOneUniQueue &in = inQueue(remoteProcessId); - debugs(54, 2, HERE << "peeking from " << remoteProcessId << " to " << + debugs(54, 2, "peeking from " << remoteProcessId << " to " << theLocalProcessId << " at " << in.size()); if (in.peek(value)) return true; // if the incoming queue is empty, check the outgoing, us-to-them queue: const OneToOneUniQueue &out = outQueue(remoteProcessId); - debugs(54, 2, HERE << "peeking from " << theLocalProcessId << " to " << + debugs(54, 2, "peeking from " << theLocalProcessId << " to " << remoteProcessId << " at " << out.size()); return out.peek(value); } diff --git a/src/ipc/ReadWriteLock.cc b/src/ipc/ReadWriteLock.cc index 041d4f5dea..9ed90bd415 100644 --- a/src/ipc/ReadWriteLock.cc +++ b/src/ipc/ReadWriteLock.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/ReadWriteLock.h b/src/ipc/ReadWriteLock.h index b79eb682c3..01c57eba18 100644 --- a/src/ipc/ReadWriteLock.h +++ b/src/ipc/ReadWriteLock.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Request.h b/src/ipc/Request.h index d48b79e20b..1fb1dc1ffd 100644 --- a/src/ipc/Request.h +++ b/src/ipc/Request.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/RequestId.cc b/src/ipc/RequestId.cc index 0efceff096..76f3ae2abf 100644 --- a/src/ipc/RequestId.cc +++ b/src/ipc/RequestId.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/RequestId.h b/src/ipc/RequestId.h index b93f3468b3..1b45eaa6c6 100644 --- a/src/ipc/RequestId.h +++ b/src/ipc/RequestId.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Response.h b/src/ipc/Response.h index bf128bb9f1..6c3db74700 100644 --- a/src/ipc/Response.h +++ b/src/ipc/Response.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/SharedListen.cc b/src/ipc/SharedListen.cc index 69fe8df7ca..7943a8ef64 100644 --- a/src/ipc/SharedListen.cc +++ b/src/ipc/SharedListen.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/SharedListen.h b/src/ipc/SharedListen.h index 5c374ab3d2..f9b42ef5e7 100644 --- a/src/ipc/SharedListen.h +++ b/src/ipc/SharedListen.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/StartListening.cc b/src/ipc/StartListening.cc index f760f8095d..6e96e8d34a 100644 --- a/src/ipc/StartListening.cc +++ b/src/ipc/StartListening.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -58,7 +58,7 @@ Ipc::StartListening(int sock_type, int proto, const Comm::ConnectionPointer &lis cbd->errNo = Comm::IsConnOpen(cbd->conn) ? 0 : errno; leave_suid(); - debugs(54, 3, HERE << "opened listen " << cbd->conn); + debugs(54, 3, "opened listen " << cbd->conn); ScheduleCallHere(callback); } diff --git a/src/ipc/StartListening.h b/src/ipc/StartListening.h index 2af537ab92..b1a035dfd8 100644 --- a/src/ipc/StartListening.h +++ b/src/ipc/StartListening.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc index 509ea90cab..cf64b73253 100644 --- a/src/ipc/StoreMap.cc +++ b/src/ipc/StoreMap.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/StoreMap.h b/src/ipc/StoreMap.h index 9c7d787f17..aab64b1d6c 100644 --- a/src/ipc/StoreMap.h +++ b/src/ipc/StoreMap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/Strand.cc b/src/ipc/Strand.cc index 1339969c52..b588883eb8 100644 --- a/src/ipc/Strand.cc +++ b/src/ipc/Strand.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -51,7 +51,7 @@ void Ipc::Strand::start() void Ipc::Strand::registerSelf() { - debugs(54, 6, HERE); + debugs(54, 6, MYNAME); Must(!isRegistered); StrandMessage::NotifyCoordinator(mtRegisterStrand, nullptr); @@ -145,20 +145,20 @@ void Ipc::Strand::handleCacheMgrResponse(const Mgr::Response& response) #if SQUID_SNMP void Ipc::Strand::handleSnmpRequest(const Snmp::Request& request) { - debugs(54, 6, HERE); + debugs(54, 6, MYNAME); Snmp::SendResponse(request.requestId, request.pdu); } void Ipc::Strand::handleSnmpResponse(const Snmp::Response& response) { - debugs(54, 6, HERE); + debugs(54, 6, MYNAME); Snmp::Forwarder::HandleRemoteAck(response.requestId); } #endif void Ipc::Strand::timedout() { - debugs(54, 6, HERE << isRegistered); + debugs(54, 6, isRegistered); if (!isRegistered) fatalf("kid%d registration timed out", KidIdentifier); } diff --git a/src/ipc/Strand.h b/src/ipc/Strand.h index daf4e4a4a5..41413f1503 100644 --- a/src/ipc/Strand.h +++ b/src/ipc/Strand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/StrandCoord.cc b/src/ipc/StrandCoord.cc index c023351b75..34f2730a79 100644 --- a/src/ipc/StrandCoord.cc +++ b/src/ipc/StrandCoord.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/StrandCoord.h b/src/ipc/StrandCoord.h index 133a711314..4967fca001 100644 --- a/src/ipc/StrandCoord.h +++ b/src/ipc/StrandCoord.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/StrandCoords.h b/src/ipc/StrandCoords.h index 3b554322f7..cd3453037a 100644 --- a/src/ipc/StrandCoords.h +++ b/src/ipc/StrandCoords.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/StrandSearch.cc b/src/ipc/StrandSearch.cc index 383e56d478..bb2ea96794 100644 --- a/src/ipc/StrandSearch.cc +++ b/src/ipc/StrandSearch.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/StrandSearch.h b/src/ipc/StrandSearch.h index dca3a6885c..706ff07838 100644 --- a/src/ipc/StrandSearch.h +++ b/src/ipc/StrandSearch.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/TypedMsgHdr.cc b/src/ipc/TypedMsgHdr.cc index 46bb5e6bea..cfb0092944 100644 --- a/src/ipc/TypedMsgHdr.cc +++ b/src/ipc/TypedMsgHdr.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/TypedMsgHdr.h b/src/ipc/TypedMsgHdr.h index 9a60cd415a..1055e02d46 100644 --- a/src/ipc/TypedMsgHdr.h +++ b/src/ipc/TypedMsgHdr.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/UdsOp.cc b/src/ipc/UdsOp.cc index df8e82eb97..f02e0777df 100644 --- a/src/ipc/UdsOp.cc +++ b/src/ipc/UdsOp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -21,12 +21,12 @@ Ipc::UdsOp::UdsOp(const String& pathAddr): address(PathToAddress(pathAddr)), options(COMM_NONBLOCKING) { - debugs(54, 5, HERE << '[' << this << "] pathAddr=" << pathAddr); + debugs(54, 5, '[' << this << "] pathAddr=" << pathAddr); } Ipc::UdsOp::~UdsOp() { - debugs(54, 5, HERE << '[' << this << ']'); + debugs(54, 5, '[' << this << ']'); if (Comm::IsConnOpen(conn_)) conn_->close(); conn_ = NULL; @@ -117,7 +117,7 @@ bool Ipc::UdsSender::doneAll() const void Ipc::UdsSender::write() { - debugs(54, 5, HERE); + debugs(54, 5, MYNAME); typedef CommCbMemFunT Dialer; AsyncCall::Pointer writeHandler = JobCallback(54, 5, Dialer, this, UdsSender::wrote); @@ -127,7 +127,7 @@ void Ipc::UdsSender::write() void Ipc::UdsSender::wrote(const CommIoCbParams& params) { - debugs(54, 5, HERE << params.conn << " flag " << params.flag << " retries " << retries << " [" << this << ']'); + debugs(54, 5, params.conn << " flag " << params.flag << " retries " << retries << " [" << this << ']'); writing = false; if (params.flag != Comm::OK && retries-- > 0) { // perhaps a fresh connection and more time will help? @@ -172,7 +172,7 @@ void Ipc::UdsSender::DelayedRetry(void *data) /// make another sending attempt after a pause void Ipc::UdsSender::delayedRetry() { - debugs(54, 5, HERE << sleeping); + debugs(54, 5, sleeping); if (sleeping) { sleeping = false; write(); // reopens the connection if needed @@ -181,7 +181,7 @@ void Ipc::UdsSender::delayedRetry() void Ipc::UdsSender::timedout() { - debugs(54, 5, HERE); + debugs(54, 5, MYNAME); mustStop("timedout"); } diff --git a/src/ipc/UdsOp.h b/src/ipc/UdsOp.h index 3e5ef11484..9ace9bc6e4 100644 --- a/src/ipc/UdsOp.h +++ b/src/ipc/UdsOp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/forward.h b/src/ipc/forward.h index 76795c6712..e3f1719d21 100644 --- a/src/ipc/forward.h +++ b/src/ipc/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/FlexibleArray.h b/src/ipc/mem/FlexibleArray.h index 9036f294f7..332972df20 100644 --- a/src/ipc/mem/FlexibleArray.h +++ b/src/ipc/mem/FlexibleArray.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/Page.cc b/src/ipc/mem/Page.cc index 8ef81a432e..02ae46d173 100644 --- a/src/ipc/mem/Page.cc +++ b/src/ipc/mem/Page.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/Page.h b/src/ipc/mem/Page.h index 19804df440..966f8ffeef 100644 --- a/src/ipc/mem/Page.h +++ b/src/ipc/mem/Page.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/PagePool.cc b/src/ipc/mem/PagePool.cc index 3750a3a029..a6237991c2 100644 --- a/src/ipc/mem/PagePool.cc +++ b/src/ipc/mem/PagePool.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/PagePool.h b/src/ipc/mem/PagePool.h index 3a9d4aa8ca..b808654465 100644 --- a/src/ipc/mem/PagePool.h +++ b/src/ipc/mem/PagePool.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/PageStack.cc b/src/ipc/mem/PageStack.cc index a4d7988600..3dbc2e6819 100644 --- a/src/ipc/mem/PageStack.cc +++ b/src/ipc/mem/PageStack.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/PageStack.h b/src/ipc/mem/PageStack.h index 51568bcb42..e5cce37a0d 100644 --- a/src/ipc/mem/PageStack.h +++ b/src/ipc/mem/PageStack.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc index 23dd8c5db7..571e530e55 100644 --- a/src/ipc/mem/Pages.cc +++ b/src/ipc/mem/Pages.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/Pages.h b/src/ipc/mem/Pages.h index ec74c4f69e..8b011d6839 100644 --- a/src/ipc/mem/Pages.h +++ b/src/ipc/mem/Pages.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/Pointer.h b/src/ipc/mem/Pointer.h index 06bc36826a..5a24790571 100644 --- a/src/ipc/mem/Pointer.h +++ b/src/ipc/mem/Pointer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/Segment.cc b/src/ipc/mem/Segment.cc index d17124dd9a..fc2491e782 100644 --- a/src/ipc/mem/Segment.cc +++ b/src/ipc/mem/Segment.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -145,7 +145,7 @@ Ipc::Mem::Segment::open(const bool unlinkWhenDone) theSize = statSize("Ipc::Mem::Segment::open"); doUnlink = unlinkWhenDone; - debugs(54, 3, HERE << "opened " << theName << " segment: " << theSize); + debugs(54, 3, "opened " << theName << " segment: " << theSize); attach(); } @@ -314,7 +314,7 @@ Ipc::Mem::Segment::~Segment() delete [] static_cast(theMem); theMem = NULL; Segments.erase(theName); - debugs(54, 3, HERE << "unlinked " << theName << " fake segment"); + debugs(54, 3, "unlinked " << theName << " fake segment"); } } @@ -339,7 +339,7 @@ Ipc::Mem::Segment::create(const off_t aSize) theSize = aSize; doUnlink = true; - debugs(54, 3, HERE << "created " << theName << " fake segment: " << theSize); + debugs(54, 3, "created " << theName << " fake segment: " << theSize); } void @@ -356,14 +356,14 @@ Ipc::Mem::Segment::open() theMem = segment.theMem; theSize = segment.theSize; - debugs(54, 3, HERE << "opened " << theName << " fake segment: " << theSize); + debugs(54, 3, "opened " << theName << " fake segment: " << theSize); } void Ipc::Mem::Segment::checkSupport(const char *const context) { if (!Enabled()) { - debugs(54, 5, HERE << context << + debugs(54, 5, context << ": True shared memory segments are not supported. " "Cannot fake shared segments in SMP config."); fatalf("Ipc::Mem::Segment: Cannot fake shared segments in SMP config (%s)\n", diff --git a/src/ipc/mem/Segment.h b/src/ipc/mem/Segment.h index efe9cccbbb..3befd7c939 100644 --- a/src/ipc/mem/Segment.h +++ b/src/ipc/mem/Segment.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc/mem/forward.h b/src/ipc/mem/forward.h index a28fb1316b..1b37dcc1e6 100644 --- a/src/ipc/mem/forward.h +++ b/src/ipc/mem/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipc_win32.cc b/src/ipc_win32.cc index f1d7a3bbd7..5b7cea09ac 100644 --- a/src/ipc_win32.cc +++ b/src/ipc_win32.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipcache.cc b/src/ipcache.cc index d839cc8472..ceda458a18 100644 --- a/src/ipcache.cc +++ b/src/ipcache.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ipcache.h b/src/ipcache.h index 9974b13755..7b18e8fdcb 100644 --- a/src/ipcache.h +++ b/src/ipcache.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/Config.cc b/src/log/Config.cc index f24c8b4472..8e73f57ca1 100644 --- a/src/log/Config.cc +++ b/src/log/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/Config.h b/src/log/Config.h index 87a055488a..f4f75f45fd 100644 --- a/src/log/Config.h +++ b/src/log/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/CustomLog.h b/src/log/CustomLog.h index 62a46225f4..f168685b55 100644 --- a/src/log/CustomLog.h +++ b/src/log/CustomLog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/DB/Makefile.am b/src/log/DB/Makefile.am index 9ea85dcbe6..d6d8526d8a 100644 --- a/src/log/DB/Makefile.am +++ b/src/log/DB/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/log/DB/doc/date_day_column.sql b/src/log/DB/doc/date_day_column.sql index 30203bf08e..9ef415da11 100644 --- a/src/log/DB/doc/date_day_column.sql +++ b/src/log/DB/doc/date_day_column.sql @@ -1,4 +1,4 @@ --- Copyright (C) 1996-2021 The Squid Software Foundation and contributors +-- Copyright (C) 1996-2022 The Squid Software Foundation and contributors -- -- Squid software is distributed under GPLv2+ license and includes -- contributions from numerous individuals and organizations. diff --git a/src/log/DB/doc/views.sql b/src/log/DB/doc/views.sql index 0d4ab311e8..79a18f5d1a 100644 --- a/src/log/DB/doc/views.sql +++ b/src/log/DB/doc/views.sql @@ -1,4 +1,4 @@ --- Copyright (C) 1996-2021 The Squid Software Foundation and contributors +-- Copyright (C) 1996-2022 The Squid Software Foundation and contributors -- -- Squid software is distributed under GPLv2+ license and includes -- contributions from numerous individuals and organizations. diff --git a/src/log/DB/log_db_daemon.pl.in b/src/log/DB/log_db_daemon.pl.in index ef5d34c293..e381d922ce 100755 --- a/src/log/DB/log_db_daemon.pl.in +++ b/src/log/DB/log_db_daemon.pl.in @@ -288,7 +288,7 @@ I> =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/DB/required.m4 b/src/log/DB/required.m4 index aa38b41834..764209565b 100755 --- a/src/log/DB/required.m4 +++ b/src/log/DB/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/log/File.cc b/src/log/File.cc index 200acf2910..88049f340a 100644 --- a/src/log/File.cc +++ b/src/log/File.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/File.h b/src/log/File.h index 97c84ea105..4d5407121a 100644 --- a/src/log/File.h +++ b/src/log/File.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/FormatHttpdCombined.cc b/src/log/FormatHttpdCombined.cc index 70ea336540..6bbc573119 100644 --- a/src/log/FormatHttpdCombined.cc +++ b/src/log/FormatHttpdCombined.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/FormatHttpdCommon.cc b/src/log/FormatHttpdCommon.cc index 9e933a032a..97e01942e7 100644 --- a/src/log/FormatHttpdCommon.cc +++ b/src/log/FormatHttpdCommon.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/FormatSquidCustom.cc b/src/log/FormatSquidCustom.cc index 15b82d0069..b7f0e23cb3 100644 --- a/src/log/FormatSquidCustom.cc +++ b/src/log/FormatSquidCustom.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/FormatSquidIcap.cc b/src/log/FormatSquidIcap.cc index 0ebb5eee4a..4d236b6fce 100644 --- a/src/log/FormatSquidIcap.cc +++ b/src/log/FormatSquidIcap.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/FormatSquidNative.cc b/src/log/FormatSquidNative.cc index 23076b2eff..9845e02df7 100644 --- a/src/log/FormatSquidNative.cc +++ b/src/log/FormatSquidNative.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/FormatSquidReferer.cc b/src/log/FormatSquidReferer.cc index 6c3e068b03..c42ca21b47 100644 --- a/src/log/FormatSquidReferer.cc +++ b/src/log/FormatSquidReferer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/FormatSquidUseragent.cc b/src/log/FormatSquidUseragent.cc index 9767376d8d..55acf3ac95 100644 --- a/src/log/FormatSquidUseragent.cc +++ b/src/log/FormatSquidUseragent.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/Formats.h b/src/log/Formats.h index 4da39d0559..070a809f43 100644 --- a/src/log/Formats.h +++ b/src/log/Formats.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/FormattedLog.cc b/src/log/FormattedLog.cc index da680e7802..7b795bbd6c 100644 --- a/src/log/FormattedLog.cc +++ b/src/log/FormattedLog.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/FormattedLog.h b/src/log/FormattedLog.h index 88920d2fb5..eabb892dc0 100644 --- a/src/log/FormattedLog.h +++ b/src/log/FormattedLog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/Makefile.am b/src/log/Makefile.am index 20604ff3bf..2790d77037 100644 --- a/src/log/Makefile.am +++ b/src/log/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/log/ModDaemon.cc b/src/log/ModDaemon.cc index 4c04bb132d..439f23df3f 100644 --- a/src/log/ModDaemon.cc +++ b/src/log/ModDaemon.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/ModDaemon.h b/src/log/ModDaemon.h index 6ac3e0d40b..d0cd935779 100644 --- a/src/log/ModDaemon.h +++ b/src/log/ModDaemon.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/ModStdio.cc b/src/log/ModStdio.cc index fc95307ec6..cd4e84a3db 100644 --- a/src/log/ModStdio.cc +++ b/src/log/ModStdio.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/ModStdio.h b/src/log/ModStdio.h index d4a103333a..09f914d757 100644 --- a/src/log/ModStdio.h +++ b/src/log/ModStdio.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/ModSyslog.cc b/src/log/ModSyslog.cc index 174f9375d3..0c7ef8f25c 100644 --- a/src/log/ModSyslog.cc +++ b/src/log/ModSyslog.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/ModSyslog.h b/src/log/ModSyslog.h index 7ff7cc546b..8cd4b3082d 100644 --- a/src/log/ModSyslog.h +++ b/src/log/ModSyslog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc index 2f54982e8c..4d7d175d1a 100644 --- a/src/log/ModUdp.cc +++ b/src/log/ModUdp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/ModUdp.h b/src/log/ModUdp.h index e4d6f99964..3d4af779dc 100644 --- a/src/log/ModUdp.h +++ b/src/log/ModUdp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/TcpLogger.cc b/src/log/TcpLogger.cc index 1dff2f2fa1..f95f2e949b 100644 --- a/src/log/TcpLogger.cc +++ b/src/log/TcpLogger.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/TcpLogger.h b/src/log/TcpLogger.h index c918302cff..ec7ca5f7b1 100644 --- a/src/log/TcpLogger.h +++ b/src/log/TcpLogger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/access_log.cc b/src/log/access_log.cc index 2dca36b8ea..db383f19e6 100644 --- a/src/log/access_log.cc +++ b/src/log/access_log.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/access_log.h b/src/log/access_log.h index a66ee55ba9..8bfe9a80ba 100644 --- a/src/log/access_log.h +++ b/src/log/access_log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/file/Makefile.am b/src/log/file/Makefile.am index 56eea0b49c..01a955bbba 100644 --- a/src/log/file/Makefile.am +++ b/src/log/file/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/log/file/log_file_daemon.cc b/src/log/file/log_file_daemon.cc index a428bc983e..121f3368c1 100644 --- a/src/log/file/log_file_daemon.cc +++ b/src/log/file/log_file_daemon.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/file/required.m4 b/src/log/file/required.m4 index 31f5b079cc..e06996df4a 100755 --- a/src/log/file/required.m4 +++ b/src/log/file/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/log/forward.h b/src/log/forward.h index b45e0204c8..f0ec366747 100644 --- a/src/log/forward.h +++ b/src/log/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/log/helpers.m4 b/src/log/helpers.m4 index 4436792f4d..bbae0b8ba8 100644 --- a/src/log/helpers.m4 +++ b/src/log/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/lookup_t.h b/src/lookup_t.h index 3ceb42942e..00b641802d 100644 --- a/src/lookup_t.h +++ b/src/lookup_t.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/main.cc b/src/main.cc index fd995d543e..989d37507c 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/AllocatorProxy.cc b/src/mem/AllocatorProxy.cc index 7e91ec4ad7..0ef60cf8ca 100644 --- a/src/mem/AllocatorProxy.cc +++ b/src/mem/AllocatorProxy.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/AllocatorProxy.h b/src/mem/AllocatorProxy.h index bf30e91566..971555e03a 100644 --- a/src/mem/AllocatorProxy.h +++ b/src/mem/AllocatorProxy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/Makefile.am b/src/mem/Makefile.am index bf01cd000e..3c07cad408 100644 --- a/src/mem/Makefile.am +++ b/src/mem/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/mem/Meter.h b/src/mem/Meter.h index 5213432b0d..4520620424 100644 --- a/src/mem/Meter.h +++ b/src/mem/Meter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/Pool.cc b/src/mem/Pool.cc index 6ec649c538..323dd2bf8e 100644 --- a/src/mem/Pool.cc +++ b/src/mem/Pool.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/Pool.h b/src/mem/Pool.h index 2879e3cbdc..a02f5b36d2 100644 --- a/src/mem/Pool.h +++ b/src/mem/Pool.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/PoolChunked.cc b/src/mem/PoolChunked.cc index 8e5bc85e2b..87cc14fe6e 100644 --- a/src/mem/PoolChunked.cc +++ b/src/mem/PoolChunked.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/PoolChunked.h b/src/mem/PoolChunked.h index 4719c6c453..6b245b48be 100644 --- a/src/mem/PoolChunked.h +++ b/src/mem/PoolChunked.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/PoolMalloc.cc b/src/mem/PoolMalloc.cc index 14a5b7dd39..b2be9f4332 100644 --- a/src/mem/PoolMalloc.cc +++ b/src/mem/PoolMalloc.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/PoolMalloc.h b/src/mem/PoolMalloc.h index 4c1df65d86..5a08b006b9 100644 --- a/src/mem/PoolMalloc.h +++ b/src/mem/PoolMalloc.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/PoolingAllocator.h b/src/mem/PoolingAllocator.h index 69726c61da..ffef9772e4 100644 --- a/src/mem/PoolingAllocator.h +++ b/src/mem/PoolingAllocator.h @@ -1,5 +1,5 @@ /* -+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors ++ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors + * + * Squid software is distributed under GPLv2+ license and includes + * contributions from numerous individuals and organizations. diff --git a/src/mem/forward.h b/src/mem/forward.h index b004743356..8a372a6dc9 100644 --- a/src/mem/forward.h +++ b/src/mem/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem/old_api.cc b/src/mem/old_api.cc index f56c03de97..c16e5fd0f5 100644 --- a/src/mem/old_api.cc +++ b/src/mem/old_api.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem_node.cc b/src/mem_node.cc index 1d0b03289d..950cb2897f 100644 --- a/src/mem_node.cc +++ b/src/mem_node.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mem_node.h b/src/mem_node.h index 5765b5a8cb..e46923d225 100644 --- a/src/mem_node.h +++ b/src/mem_node.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Action.cc b/src/mgr/Action.cc index 129e9c4ebc..c875c22bfe 100644 --- a/src/mgr/Action.cc +++ b/src/mgr/Action.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -67,7 +67,7 @@ Mgr::Action::add(const Action &) void Mgr::Action::respond(const Request &request) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); // Assume most kid classes are fully aggregatable (i.e., they do not dump // local info at all). Do not import the remote HTTP fd into our Comm @@ -90,7 +90,7 @@ Mgr::Action::sendResponse(const Ipc::RequestId requestId) void Mgr::Action::run(StoreEntry* entry, bool writeHttpHeader) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); collect(); fillEntry(entry, writeHttpHeader); } @@ -98,7 +98,7 @@ Mgr::Action::run(StoreEntry* entry, bool writeHttpHeader) void Mgr::Action::fillEntry(StoreEntry* entry, bool writeHttpHeader) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); entry->buffer(); if (writeHttpHeader) { diff --git a/src/mgr/Action.h b/src/mgr/Action.h index eecc90b076..f66ddf42ec 100644 --- a/src/mgr/Action.h +++ b/src/mgr/Action.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/ActionCreator.h b/src/mgr/ActionCreator.h index 51416160a1..dbcfbca01f 100644 --- a/src/mgr/ActionCreator.h +++ b/src/mgr/ActionCreator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/ActionParams.cc b/src/mgr/ActionParams.cc index 8444ec3050..13f8592e68 100644 --- a/src/mgr/ActionParams.cc +++ b/src/mgr/ActionParams.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/ActionParams.h b/src/mgr/ActionParams.h index 1fe0b1569d..fad4194c41 100644 --- a/src/mgr/ActionParams.h +++ b/src/mgr/ActionParams.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/ActionPasswordList.cc b/src/mgr/ActionPasswordList.cc index 32e74b9cf9..c544dd3386 100644 --- a/src/mgr/ActionPasswordList.cc +++ b/src/mgr/ActionPasswordList.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/ActionPasswordList.h b/src/mgr/ActionPasswordList.h index da9b38a62c..460e004166 100644 --- a/src/mgr/ActionPasswordList.h +++ b/src/mgr/ActionPasswordList.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/ActionProfile.h b/src/mgr/ActionProfile.h index 9218489e0c..895cc09033 100644 --- a/src/mgr/ActionProfile.h +++ b/src/mgr/ActionProfile.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/ActionWriter.cc b/src/mgr/ActionWriter.cc index a1a3e9bbdc..a9e179bb0d 100644 --- a/src/mgr/ActionWriter.cc +++ b/src/mgr/ActionWriter.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -20,13 +20,13 @@ Mgr::ActionWriter::ActionWriter(const Action::Pointer &anAction, const Comm::Con StoreToCommWriter(conn, anAction->createStoreEntry()), action(anAction) { - debugs(16, 5, HERE << conn << " action: " << action); + debugs(16, 5, conn << " action: " << action); } void Mgr::ActionWriter::start() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(action != NULL); StoreToCommWriter::start(); diff --git a/src/mgr/ActionWriter.h b/src/mgr/ActionWriter.h index 4fb434284e..56dc58e8b3 100644 --- a/src/mgr/ActionWriter.h +++ b/src/mgr/ActionWriter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/BasicActions.cc b/src/mgr/BasicActions.cc index 7175629a7a..a5d7256b56 100644 --- a/src/mgr/BasicActions.cc +++ b/src/mgr/BasicActions.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -27,13 +27,13 @@ Mgr::IndexAction::Create(const Command::Pointer &cmd) Mgr::IndexAction::IndexAction(const Command::Pointer &aCmd): Action(aCmd) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void Mgr::IndexAction::dump(StoreEntry *) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } Mgr::MenuAction::Pointer @@ -44,13 +44,13 @@ Mgr::MenuAction::Create(const Command::Pointer &cmd) Mgr::MenuAction::MenuAction(const Command::Pointer &aCmd): Action(aCmd) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void Mgr::MenuAction::dump(StoreEntry* entry) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(entry != NULL); typedef CacheManager::Menu::const_iterator Iterator; @@ -71,7 +71,7 @@ Mgr::ShutdownAction::Create(const Command::Pointer &cmd) Mgr::ShutdownAction::ShutdownAction(const Command::Pointer &aCmd): Action(aCmd) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void @@ -90,7 +90,7 @@ Mgr::ReconfigureAction::Create(const Command::Pointer &cmd) Mgr::ReconfigureAction::ReconfigureAction(const Command::Pointer &aCmd): Action(aCmd) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void @@ -109,7 +109,7 @@ Mgr::RotateAction::Create(const Command::Pointer &cmd) Mgr::RotateAction::RotateAction(const Command::Pointer &aCmd): Action(aCmd) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void @@ -133,7 +133,7 @@ Mgr::OfflineToggleAction::Create(const Command::Pointer &cmd) Mgr::OfflineToggleAction::OfflineToggleAction(const Command::Pointer &aCmd): Action(aCmd) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void diff --git a/src/mgr/BasicActions.h b/src/mgr/BasicActions.h index 3c6fec2035..a9b45f4ee6 100644 --- a/src/mgr/BasicActions.h +++ b/src/mgr/BasicActions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Command.cc b/src/mgr/Command.cc index b1d0d00653..cfc44becba 100644 --- a/src/mgr/Command.cc +++ b/src/mgr/Command.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Command.h b/src/mgr/Command.h index a58804dace..52395e6daa 100644 --- a/src/mgr/Command.h +++ b/src/mgr/Command.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/CountersAction.cc b/src/mgr/CountersAction.cc index b5ffed3c53..b15dc724b7 100644 --- a/src/mgr/CountersAction.cc +++ b/src/mgr/CountersAction.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -103,27 +103,27 @@ Mgr::CountersAction::Create(const CommandPointer &cmd) Mgr::CountersAction::CountersAction(const CommandPointer &aCmd): Action(aCmd), data() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void Mgr::CountersAction::add(const Action& action) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); data += dynamic_cast(action).data; } void Mgr::CountersAction::collect() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); GetCountersStats(data); } void Mgr::CountersAction::dump(StoreEntry* entry) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(entry != NULL); DumpCountersStats(data, entry); } diff --git a/src/mgr/CountersAction.h b/src/mgr/CountersAction.h index b2e7bd0c5f..f714262369 100644 --- a/src/mgr/CountersAction.h +++ b/src/mgr/CountersAction.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Filler.cc b/src/mgr/Filler.cc index eff191230b..a03031db04 100644 --- a/src/mgr/Filler.cc +++ b/src/mgr/Filler.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -24,13 +24,13 @@ Mgr::Filler::Filler(const Action::Pointer &anAction, const Comm::ConnectionPoint action(anAction), requestId(aRequestId) { - debugs(16, 5, HERE << conn << " action: " << action); + debugs(16, 5, conn << " action: " << action); } void Mgr::Filler::start() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(requestId != 0); Must(action != NULL); @@ -41,7 +41,7 @@ Mgr::Filler::start() void Mgr::Filler::swanSong() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); action->sendResponse(requestId); StoreToCommWriter::swanSong(); } diff --git a/src/mgr/Filler.h b/src/mgr/Filler.h index ff5b2d2235..d40c6f24e3 100644 --- a/src/mgr/Filler.h +++ b/src/mgr/Filler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Forwarder.cc b/src/mgr/Forwarder.cc index f48069c146..7bd86d735b 100644 --- a/src/mgr/Forwarder.cc +++ b/src/mgr/Forwarder.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -34,7 +34,7 @@ Mgr::Forwarder::Forwarder(const Comm::ConnectionPointer &aConn, const ActionPara Ipc::Forwarder(new Request(KidIdentifier, Ipc::RequestId(/*XXX*/), aConn, aParams), 10), httpRequest(aRequest), entry(anEntry), conn(aConn), ale(anAle) { - debugs(16, 5, HERE << conn); + debugs(16, 5, conn); Must(Comm::IsConnOpen(conn)); Must(httpRequest != NULL); Must(entry != NULL); @@ -99,7 +99,7 @@ Mgr::Forwarder::handleException(const std::exception &e) void Mgr::Forwarder::noteCommClosed(const CommCloseCbParams &) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); closer = nullptr; if (conn) { conn->noteClosure(); @@ -112,7 +112,7 @@ Mgr::Forwarder::noteCommClosed(const CommCloseCbParams &) void Mgr::Forwarder::sendError(ErrorState *error) { - debugs(16, 3, HERE); + debugs(16, 3, MYNAME); Must(error != NULL); Must(entry != NULL); Must(httpRequest != NULL); diff --git a/src/mgr/Forwarder.h b/src/mgr/Forwarder.h index 7e9d837a2b..9fceafb622 100644 --- a/src/mgr/Forwarder.h +++ b/src/mgr/Forwarder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/FunAction.cc b/src/mgr/FunAction.cc index 31a02ea702..7c6aa9a126 100644 --- a/src/mgr/FunAction.cc +++ b/src/mgr/FunAction.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -31,13 +31,13 @@ Mgr::FunAction::FunAction(const Command::Pointer &aCmd, OBJH* aHandler): Action(aCmd), handler(aHandler) { Must(handler != NULL); - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void Mgr::FunAction::respond(const Request& request) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Ipc::ImportFdIntoComm(request.conn, SOCK_STREAM, IPPROTO_TCP, Ipc::fdnHttpSocket); Must(Comm::IsConnOpen(request.conn)); Must(request.requestId != 0); @@ -47,7 +47,7 @@ Mgr::FunAction::respond(const Request& request) void Mgr::FunAction::dump(StoreEntry* entry) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(entry != NULL); if (UsingSmp()) storeAppendPrintf(entry, "by kid%d {\n", KidIdentifier); diff --git a/src/mgr/FunAction.h b/src/mgr/FunAction.h index 5bac5f9340..d2ea07edd0 100644 --- a/src/mgr/FunAction.h +++ b/src/mgr/FunAction.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc index 1b54c82db0..49bbc2558f 100644 --- a/src/mgr/InfoAction.cc +++ b/src/mgr/InfoAction.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -111,20 +111,20 @@ Mgr::InfoAction::Create(const CommandPointer &cmd) Mgr::InfoAction::InfoAction(const CommandPointer &aCmd): Action(aCmd), data() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void Mgr::InfoAction::add(const Action& action) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); data += dynamic_cast(action).data; } void Mgr::InfoAction::respond(const Request& request) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Ipc::ImportFdIntoComm(request.conn, SOCK_STREAM, IPPROTO_TCP, Ipc::fdnHttpSocket); Must(Comm::IsConnOpen(request.conn)); Must(request.requestId != 0); @@ -140,7 +140,7 @@ Mgr::InfoAction::collect() void Mgr::InfoAction::dump(StoreEntry* entry) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(entry != NULL); #if XMALLOC_STATISTICS diff --git a/src/mgr/InfoAction.h b/src/mgr/InfoAction.h index 036fcb16d8..a1fb42fd05 100644 --- a/src/mgr/InfoAction.h +++ b/src/mgr/InfoAction.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Inquirer.cc b/src/mgr/Inquirer.cc index 8bfa118b3a..9c44df087d 100644 --- a/src/mgr/Inquirer.cc +++ b/src/mgr/Inquirer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -39,7 +39,7 @@ Mgr::Inquirer::Inquirer(Action::Pointer anAction, conn = aCause.conn; Ipc::ImportFdIntoComm(conn, SOCK_STREAM, IPPROTO_TCP, Ipc::fdnHttpSocket); - debugs(16, 5, HERE << conn << " action: " << aggrAction); + debugs(16, 5, conn << " action: " << aggrAction); closer = asyncCall(16, 5, "Mgr::Inquirer::noteCommClosed", CommCbMemFunT(this, &Inquirer::noteCommClosed)); @@ -68,7 +68,7 @@ Mgr::Inquirer::removeCloseHandler() void Mgr::Inquirer::start() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Ipc::Inquirer::start(); Must(Comm::IsConnOpen(conn)); Must(aggrAction != NULL); @@ -96,7 +96,7 @@ Mgr::Inquirer::start() void Mgr::Inquirer::noteWroteHeader(const CommIoCbParams& params) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); writer = NULL; Must(params.flag == Comm::OK); Must(params.conn.getRaw() == conn.getRaw()); @@ -109,7 +109,7 @@ Mgr::Inquirer::noteWroteHeader(const CommIoCbParams& params) void Mgr::Inquirer::noteCommClosed(const CommCloseCbParams &) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); closer = nullptr; if (conn) { conn->noteClosure(); @@ -176,9 +176,9 @@ Mgr::Inquirer::applyQueryParams(const Ipc::StrandCoords& aStrands, const QueryPa } } - debugs(16, 4, HERE << "strands kid IDs = "); + debugs(16, 4, "strands kid IDs = "); for (Ipc::StrandCoords::const_iterator iter = sc.begin(); iter != sc.end(); ++iter) { - debugs(16, 4, HERE << iter->kidId); + debugs(16, 4, iter->kidId); } return sc; diff --git a/src/mgr/Inquirer.h b/src/mgr/Inquirer.h index 85e4a58822..e98fbeb4e2 100644 --- a/src/mgr/Inquirer.h +++ b/src/mgr/Inquirer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/IntParam.cc b/src/mgr/IntParam.cc index a333703126..04a6c32149 100644 --- a/src/mgr/IntParam.cc +++ b/src/mgr/IntParam.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/IntParam.h b/src/mgr/IntParam.h index 7b2a2cf6b3..5d6d30e654 100644 --- a/src/mgr/IntParam.h +++ b/src/mgr/IntParam.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/IntervalAction.cc b/src/mgr/IntervalAction.cc index e66351d466..2a29be1b2c 100644 --- a/src/mgr/IntervalAction.cc +++ b/src/mgr/IntervalAction.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -128,13 +128,13 @@ Mgr::IntervalAction::Create60min(const CommandPointer &cmd) Mgr::IntervalAction::IntervalAction(const CommandPointer &aCmd, int aMinutes, int aHours): Action(aCmd), minutes(aMinutes), hours(aHours), data() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void Mgr::IntervalAction::add(const Action& action) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); data += dynamic_cast(action).data; } @@ -147,7 +147,7 @@ Mgr::IntervalAction::collect() void Mgr::IntervalAction::dump(StoreEntry* entry) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(entry != NULL); DumpAvgStat(data, entry); } diff --git a/src/mgr/IntervalAction.h b/src/mgr/IntervalAction.h index d5a249d021..d6c49008a2 100644 --- a/src/mgr/IntervalAction.h +++ b/src/mgr/IntervalAction.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/IoAction.cc b/src/mgr/IoAction.cc index 149f2c4e31..8000799a9a 100644 --- a/src/mgr/IoAction.cc +++ b/src/mgr/IoAction.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -51,13 +51,13 @@ Mgr::IoAction::Create(const CommandPointer &cmd) Mgr::IoAction::IoAction(const CommandPointer &aCmd): Action(aCmd), data() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void Mgr::IoAction::add(const Action& action) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); data += dynamic_cast(action).data; } @@ -70,7 +70,7 @@ Mgr::IoAction::collect() void Mgr::IoAction::dump(StoreEntry* entry) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(entry != NULL); DumpIoStats(data, entry); } diff --git a/src/mgr/IoAction.h b/src/mgr/IoAction.h index 32de0894e5..7e9ad1a7a6 100644 --- a/src/mgr/IoAction.h +++ b/src/mgr/IoAction.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Makefile.am b/src/mgr/Makefile.am index 16744b0226..0f5df3ac67 100644 --- a/src/mgr/Makefile.am +++ b/src/mgr/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/mgr/QueryParam.h b/src/mgr/QueryParam.h index 09a15c794a..e00396ddd9 100644 --- a/src/mgr/QueryParam.h +++ b/src/mgr/QueryParam.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/QueryParams.cc b/src/mgr/QueryParams.cc index 6ff049c68a..a1e8f9ebc8 100644 --- a/src/mgr/QueryParams.cc +++ b/src/mgr/QueryParams.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/QueryParams.h b/src/mgr/QueryParams.h index d75580fb7a..dd37eb37fd 100644 --- a/src/mgr/QueryParams.h +++ b/src/mgr/QueryParams.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Registration.cc b/src/mgr/Registration.cc index 9e1ba55161..924bb346f0 100644 --- a/src/mgr/Registration.cc +++ b/src/mgr/Registration.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Registration.h b/src/mgr/Registration.h index 5c781199e7..1f4faf15a9 100644 --- a/src/mgr/Registration.h +++ b/src/mgr/Registration.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Request.cc b/src/mgr/Request.cc index 3daf426a3c..b10be04819 100644 --- a/src/mgr/Request.cc +++ b/src/mgr/Request.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Request.h b/src/mgr/Request.h index b60e90f5f9..59b2dd7954 100644 --- a/src/mgr/Request.h +++ b/src/mgr/Request.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Response.cc b/src/mgr/Response.cc index d4db63eda4..545fcb2cc4 100644 --- a/src/mgr/Response.cc +++ b/src/mgr/Response.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/Response.h b/src/mgr/Response.h index c7412ae66e..38461f8b32 100644 --- a/src/mgr/Response.h +++ b/src/mgr/Response.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/ServiceTimesAction.cc b/src/mgr/ServiceTimesAction.cc index 13a0f09cc4..dcc72917a5 100644 --- a/src/mgr/ServiceTimesAction.cc +++ b/src/mgr/ServiceTimesAction.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -63,27 +63,27 @@ Mgr::ServiceTimesAction::Create(const CommandPointer &cmd) Mgr::ServiceTimesAction::ServiceTimesAction(const CommandPointer &aCmd): Action(aCmd), data() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void Mgr::ServiceTimesAction::add(const Action& action) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); data += dynamic_cast(action).data; } void Mgr::ServiceTimesAction::collect() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); GetServiceTimesStats(data); } void Mgr::ServiceTimesAction::dump(StoreEntry* entry) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(entry != NULL); DumpServiceTimesStats(data, entry); } diff --git a/src/mgr/ServiceTimesAction.h b/src/mgr/ServiceTimesAction.h index 6a11d95aa4..75e82c32d4 100644 --- a/src/mgr/ServiceTimesAction.h +++ b/src/mgr/ServiceTimesAction.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/StoreIoAction.cc b/src/mgr/StoreIoAction.cc index 03cf56384e..42b8b4d9f5 100644 --- a/src/mgr/StoreIoAction.cc +++ b/src/mgr/StoreIoAction.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -41,13 +41,13 @@ Mgr::StoreIoAction::Create(const CommandPointer &cmd) Mgr::StoreIoAction::StoreIoAction(const CommandPointer &aCmd): Action(aCmd), data() { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); } void Mgr::StoreIoAction::add(const Action& action) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); data += dynamic_cast(action).data; } @@ -63,7 +63,7 @@ Mgr::StoreIoAction::collect() void Mgr::StoreIoAction::dump(StoreEntry* entry) { - debugs(16, 5, HERE); + debugs(16, 5, MYNAME); Must(entry != NULL); storeAppendPrintf(entry, "Store IO Interface Stats\n"); storeAppendPrintf(entry, "create.calls %.0f\n", data.create_calls); diff --git a/src/mgr/StoreIoAction.h b/src/mgr/StoreIoAction.h index 956b793554..8087bcc6ec 100644 --- a/src/mgr/StoreIoAction.h +++ b/src/mgr/StoreIoAction.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/StoreToCommWriter.cc b/src/mgr/StoreToCommWriter.cc index f2cc23dc82..74d95ea907 100644 --- a/src/mgr/StoreToCommWriter.cc +++ b/src/mgr/StoreToCommWriter.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -25,7 +25,7 @@ Mgr::StoreToCommWriter::StoreToCommWriter(const Comm::ConnectionPointer &conn, S AsyncJob("Mgr::StoreToCommWriter"), clientConnection(conn), entry(anEntry), sc(NULL), writeOffset(0), closer(NULL) { - debugs(16, 6, HERE << clientConnection); + debugs(16, 6, clientConnection); closer = asyncCall(16, 5, "Mgr::StoreToCommWriter::noteCommClosed", CommCbMemFunT(this, &StoreToCommWriter::noteCommClosed)); comm_add_close_handler(clientConnection->fd, closer); @@ -33,7 +33,7 @@ Mgr::StoreToCommWriter::StoreToCommWriter(const Comm::ConnectionPointer &conn, S Mgr::StoreToCommWriter::~StoreToCommWriter() { - debugs(16, 6, HERE); + debugs(16, 6, MYNAME); assert(!entry); assert(!sc); close(); @@ -55,7 +55,7 @@ Mgr::StoreToCommWriter::close() void Mgr::StoreToCommWriter::start() { - debugs(16, 6, HERE); + debugs(16, 6, MYNAME); Must(Comm::IsConnOpen(clientConnection)); Must(entry != NULL); AsyncCall::Pointer call = asyncCall(16, 4, "StoreToCommWriter::Abort", cbdataDialer(&StoreToCommWriter::HandleStoreAbort, this)); @@ -70,7 +70,7 @@ Mgr::StoreToCommWriter::start() void Mgr::StoreToCommWriter::scheduleStoreCopy() { - debugs(16, 6, HERE); + debugs(16, 6, MYNAME); Must(entry != NULL); Must(sc != NULL); StoreIOBuffer readBuf(sizeof(buffer), writeOffset, buffer); @@ -93,7 +93,7 @@ Mgr::StoreToCommWriter::NoteStoreCopied(void* data, StoreIOBuffer ioBuf) void Mgr::StoreToCommWriter::noteStoreCopied(StoreIOBuffer ioBuf) { - debugs(16, 6, HERE); + debugs(16, 6, MYNAME); Must(!ioBuf.flags.error); if (ioBuf.length > 0) scheduleCommWrite(ioBuf); // write received action results to client @@ -104,7 +104,7 @@ Mgr::StoreToCommWriter::noteStoreCopied(StoreIOBuffer ioBuf) void Mgr::StoreToCommWriter::scheduleCommWrite(const StoreIOBuffer& ioBuf) { - debugs(16, 6, HERE); + debugs(16, 6, MYNAME); Must(Comm::IsConnOpen(clientConnection)); Must(ioBuf.data != NULL); // write filled buffer @@ -118,7 +118,7 @@ Mgr::StoreToCommWriter::scheduleCommWrite(const StoreIOBuffer& ioBuf) void Mgr::StoreToCommWriter::noteCommWrote(const CommIoCbParams& params) { - debugs(16, 6, HERE); + debugs(16, 6, MYNAME); Must(params.flag == Comm::OK); Must(clientConnection != NULL && params.fd == clientConnection->fd); Must(params.size != 0); @@ -130,7 +130,7 @@ Mgr::StoreToCommWriter::noteCommWrote(const CommIoCbParams& params) void Mgr::StoreToCommWriter::noteCommClosed(const CommCloseCbParams &) { - debugs(16, 6, HERE); + debugs(16, 6, MYNAME); if (clientConnection) { clientConnection->noteClosure(); clientConnection = nullptr; @@ -142,7 +142,7 @@ Mgr::StoreToCommWriter::noteCommClosed(const CommCloseCbParams &) void Mgr::StoreToCommWriter::swanSong() { - debugs(16, 6, HERE); + debugs(16, 6, MYNAME); if (entry != NULL) { if (sc != NULL) { storeUnregister(sc, entry, this); diff --git a/src/mgr/StoreToCommWriter.h b/src/mgr/StoreToCommWriter.h index d37a18c2e6..8fd9b5d94a 100644 --- a/src/mgr/StoreToCommWriter.h +++ b/src/mgr/StoreToCommWriter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/StringParam.cc b/src/mgr/StringParam.cc index f5cbf77c36..a6fe978dd5 100644 --- a/src/mgr/StringParam.cc +++ b/src/mgr/StringParam.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/StringParam.h b/src/mgr/StringParam.h index 6f0157b674..e69d4bb12c 100644 --- a/src/mgr/StringParam.h +++ b/src/mgr/StringParam.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mgr/forward.h b/src/mgr/forward.h index 726ee4994b..d9ad57abee 100644 --- a/src/mgr/forward.h +++ b/src/mgr/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mime.cc b/src/mime.cc index d145f3e56f..edf94b975c 100644 --- a/src/mime.cc +++ b/src/mime.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mime.conf.default b/src/mime.conf.default index e1fc509306..66186f1f06 100644 --- a/src/mime.conf.default +++ b/src/mime.conf.default @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/mime.h b/src/mime.h index 49e8d1eaef..251348c82f 100644 --- a/src/mime.h +++ b/src/mime.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mime_header.cc b/src/mime_header.cc index 85e69abdfa..cb198a42d0 100644 --- a/src/mime_header.cc +++ b/src/mime_header.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mime_header.h b/src/mime_header.h index c7aaee55ea..36084fab21 100644 --- a/src/mime_header.h +++ b/src/mime_header.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/mk-globals-c.awk b/src/mk-globals-c.awk index 3f457bd7f7..c954703d5c 100644 --- a/src/mk-globals-c.awk +++ b/src/mk-globals-c.awk @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/mk-string-arrays.awk b/src/mk-string-arrays.awk index 880e3a74b7..b38cf043bb 100644 --- a/src/mk-string-arrays.awk +++ b/src/mk-string-arrays.awk @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/multicast.cc b/src/multicast.cc index 8e0d370f44..6046b1be01 100644 --- a/src/multicast.cc +++ b/src/multicast.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/multicast.h b/src/multicast.h index 5f8709cac7..85bb736a67 100644 --- a/src/multicast.h +++ b/src/multicast.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/neighbors.cc b/src/neighbors.cc index 8a74109626..cd0875cff0 100644 --- a/src/neighbors.cc +++ b/src/neighbors.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -347,7 +347,7 @@ getRoundRobinParent(PeerSelector *ps) if (q) ++ q->rr_count; - debugs(15, 3, HERE << "returning " << (q ? q->host : "NULL")); + debugs(15, 3, "returning " << (q ? q->host : "NULL")); return q; } diff --git a/src/neighbors.h b/src/neighbors.h index 5235672515..0cb792404b 100644 --- a/src/neighbors.h +++ b/src/neighbors.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/parser/BinaryTokenizer.cc b/src/parser/BinaryTokenizer.cc index 115ded5eb7..66bd1b72b8 100644 --- a/src/parser/BinaryTokenizer.cc +++ b/src/parser/BinaryTokenizer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/parser/BinaryTokenizer.h b/src/parser/BinaryTokenizer.h index 850075521d..74fdf20ef3 100644 --- a/src/parser/BinaryTokenizer.h +++ b/src/parser/BinaryTokenizer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index 7a1862a258..bcccdd5e0a 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/parser/Tokenizer.cc b/src/parser/Tokenizer.cc index a173c2c06d..a8a9407783 100644 --- a/src/parser/Tokenizer.cc +++ b/src/parser/Tokenizer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/parser/Tokenizer.h b/src/parser/Tokenizer.h index 03a83881b5..268074f02d 100644 --- a/src/parser/Tokenizer.h +++ b/src/parser/Tokenizer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/parser/forward.h b/src/parser/forward.h index 9e7beeb51b..da33c4dd86 100644 --- a/src/parser/forward.h +++ b/src/parser/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/pconn.cc b/src/pconn.cc index 397a6b8b6b..143b1e8191 100644 --- a/src/pconn.cc +++ b/src/pconn.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -73,12 +73,12 @@ IdleConnList::findIndexOf(const Comm::ConnectionPointer &conn) const { for (int index = size_ - 1; index >= 0; --index) { if (conn->fd == theList_[index]->fd) { - debugs(48, 3, HERE << "found " << conn << " at index " << index); + debugs(48, 3, "found " << conn << " at index " << index); return index; } } - debugs(48, 2, HERE << conn << " NOT FOUND!"); + debugs(48, 2, conn << " NOT FOUND!"); return -1; } @@ -113,10 +113,10 @@ void IdleConnList::closeN(size_t n) { if (n < 1) { - debugs(48, 2, HERE << "Nothing to do."); + debugs(48, 2, "Nothing to do."); return; } else if (n >= (size_t)size_) { - debugs(48, 2, HERE << "Closing all entries."); + debugs(48, 2, "Closing all entries."); while (size_ > 0) { const Comm::ConnectionPointer conn = theList_[--size_]; theList_[size_] = NULL; @@ -126,7 +126,7 @@ IdleConnList::closeN(size_t n) parent_->noteConnectionRemoved(); } } else { //if (n < size_) - debugs(48, 2, HERE << "Closing " << n << " of " << size_ << " entries."); + debugs(48, 2, "Closing " << n << " of " << size_ << " entries."); size_t index; // ensure the first N entries are closed @@ -159,7 +159,7 @@ IdleConnList::closeN(size_t n) void IdleConnList::clearHandlers(const Comm::ConnectionPointer &conn) { - debugs(48, 3, HERE << "removing close handler for " << conn); + debugs(48, 3, "removing close handler for " << conn); comm_read_cancel(conn->fd, IdleConnList::Read, this); commUnsetConnTimeout(conn); } @@ -168,7 +168,7 @@ void IdleConnList::push(const Comm::ConnectionPointer &conn) { if (size_ == capacity_) { - debugs(48, 3, HERE << "growing idle Connection array"); + debugs(48, 3, "growing idle Connection array"); capacity_ <<= 1; const Comm::ConnectionPointer *oldList = theList_; theList_ = new Comm::ConnectionPointer[capacity_]; @@ -297,10 +297,10 @@ IdleConnList::findAndClose(const Comm::ConnectionPointer &conn) void IdleConnList::Read(const Comm::ConnectionPointer &conn, char *, size_t len, Comm::Flag flag, int, void *data) { - debugs(48, 3, HERE << len << " bytes from " << conn); + debugs(48, 3, len << " bytes from " << conn); if (flag == Comm::ERR_CLOSING) { - debugs(48, 3, HERE << "Comm::ERR_CLOSING from " << conn); + debugs(48, 3, "Comm::ERR_CLOSING from " << conn); /* Bail out on Comm::ERR_CLOSING - may happen when shutdown aborts our idle FD */ return; } @@ -313,7 +313,7 @@ IdleConnList::Read(const Comm::ConnectionPointer &conn, char *, size_t len, Comm void IdleConnList::Timeout(const CommTimeoutCbParams &io) { - debugs(48, 3, HERE << io.conn); + debugs(48, 3, io.conn); IdleConnList *list = static_cast(io.data); /* may delete list/data */ list->findAndClose(io.conn); @@ -412,12 +412,12 @@ void PconnPool::push(const Comm::ConnectionPointer &conn, const char *domain) { if (fdUsageHigh()) { - debugs(48, 3, HERE << "Not many unused FDs"); + debugs(48, 3, "Not many unused FDs"); conn->close(); return; } else if (shutting_down) { conn->close(); - debugs(48, 3, HERE << "Squid is shutting down. Refusing to do anything"); + debugs(48, 3, "Squid is shutting down. Refusing to do anything"); return; } // TODO: also close used pconns if we exceed peer max-conn limit @@ -439,7 +439,7 @@ PconnPool::push(const Comm::ConnectionPointer &conn, const char *domain) LOCAL_ARRAY(char, desc, FD_DESC_SZ); snprintf(desc, FD_DESC_SZ, "Idle server: %s", aKey); fd_note(conn->fd, desc); - debugs(48, 3, HERE << "pushed " << conn << " for " << aKey); + debugs(48, 3, "pushed " << conn << " for " << aKey); // successful push notifications resume multi-connection opening sequence notifyManager("push"); @@ -471,7 +471,7 @@ PconnPool::popStored(const Comm::ConnectionPointer &dest, const char *domain, co IdleConnList *list = (IdleConnList *)hash_lookup(table, aKey); if (list == NULL) { - debugs(48, 3, HERE << "lookup for key {" << aKey << "} failed."); + debugs(48, 3, "lookup for key {" << aKey << "} failed."); // failure notifications resume standby conn creation after fdUsageHigh notifyManager("pop lookup failure"); return Comm::ConnectionPointer(); diff --git a/src/pconn.h b/src/pconn.h index 5f5b6fb4ee..85e44e50bf 100644 --- a/src/pconn.h +++ b/src/pconn.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/peer_digest.cc b/src/peer_digest.cc index 7b71528fc3..fcc70a5cab 100644 --- a/src/peer_digest.cc +++ b/src/peer_digest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/peer_proxy_negotiate_auth.cc b/src/peer_proxy_negotiate_auth.cc index d1251858aa..8544771ef3 100644 --- a/src/peer_proxy_negotiate_auth.cc +++ b/src/peer_proxy_negotiate_auth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -174,14 +174,14 @@ int check_gss_err(OM_uint32 major_status, OM_uint32 minor_status, } gss_release_buffer(&min_stat, &status_string); } - debugs(11, 5, HERE << function << "failed: " << buf); + debugs(11, 5, function << "failed: " << buf); return (1); } return (0); } void krb5_cleanup() { - debugs(11, 5, HERE << "Cleanup kerberos context"); + debugs(11, 5, "Cleanup kerberos context"); if (kparam.context) { if (kparam.cc) krb5_cc_destroy(kparam.context, kparam.cc); @@ -251,7 +251,7 @@ restart: &creds2.client); if (code) { debugs(11, 5, - HERE << + "Error while getting principal from credential cache : " << error_message(code)); return (1); @@ -267,7 +267,7 @@ restart: (krb5_const_realm)&client_realm, NULL); if (code) { debugs(11, 5, - HERE << "Error while getting krbtgt principal : " << + "Error while getting krbtgt principal : " << error_message(code)); return (1); } @@ -284,7 +284,7 @@ restart: goto restart; } debugs(11, 5, - HERE << "Error while get credentials : " << + "Error while get credentials : " << error_message(code)); return (1); } @@ -295,7 +295,7 @@ restart: code = krb5_init_context(&kparam.context); if (code) { debugs(11, 5, - HERE << "Error while initialising Kerberos library : " + "Error while initialising Kerberos library : " << error_message(code)); return (1); } @@ -306,7 +306,7 @@ restart: if (profile) profile_release(profile); debugs(11, 5, - HERE << "Error while getting profile : " << + "Error while getting profile : " << error_message(code)); return (1); } @@ -317,7 +317,7 @@ restart: profile_release(profile); if (code) { debugs(11, 5, - HERE << "Error while getting clockskew : " << + "Error while getting clockskew : " << error_message(code)); return (1); } @@ -345,7 +345,7 @@ restart: code = krb5_kt_resolve(kparam.context, keytab_filename, &keytab); if (code) { debugs(11, 5, - HERE << "Error while resolving keytab filename " << + "Error while resolving keytab filename " << keytab_filename << " : " << error_message(code)); return (1); } @@ -354,7 +354,7 @@ restart: code = krb5_kt_start_seq_get(kparam.context, keytab, &cursor); if (code) { debugs(11, 5, - HERE << "Error while starting keytab scan : " << + "Error while starting keytab scan : " << error_message(code)); return (1); } @@ -364,7 +364,7 @@ restart: &principal); if (code && code != KRB5_KT_END) { debugs(11, 5, - HERE << "Error while scanning keytab : " << + "Error while scanning keytab : " << error_message(code)); return (1); } @@ -372,7 +372,7 @@ restart: code = krb5_kt_end_seq_get(kparam.context, keytab, &cursor); if (code) { debugs(11, 5, - HERE << "Error while ending keytab scan : " << + "Error while ending keytab scan : " << error_message(code)); return (1); } @@ -383,7 +383,7 @@ restart: #endif if (code) { debugs(11, 5, - HERE << "Error while freeing keytab entry : " << + "Error while freeing keytab entry : " << error_message(code)); return (1); } @@ -397,7 +397,7 @@ restart: krb5_parse_name(kparam.context, principal_name, &principal); if (code) { debugs(11, 5, - HERE << "Error while parsing principal name " << + "Error while parsing principal name " << principal_name << " : " << error_message(code)); return (1); } @@ -413,7 +413,7 @@ restart: code = krb5_string_to_deltat((char *) MAX_RENEW_TIME, &rlife); if (code != 0 || rlife == 0) { debugs(11, 5, - HERE << "Error bad lifetime value " << MAX_RENEW_TIME << + "Error bad lifetime value " << MAX_RENEW_TIME << " : " << error_message(code)); return (1); } @@ -435,7 +435,7 @@ restart: #endif if (code) { debugs(11, 5, - HERE << + "Error while initializing credentials from keytab : " << error_message(code)); return (1); @@ -469,14 +469,14 @@ restart: xfree(mem_cache); if (code) { debugs(11, 5, - HERE << "Error while resolving memory credential cache : " + "Error while resolving memory credential cache : " << error_message(code)); return (1); } code = krb5_cc_initialize(kparam.context, kparam.cc, principal); if (code) { debugs(11, 5, - HERE << + "Error while initializing memory credential cache : " << error_message(code)); return (1); @@ -484,7 +484,7 @@ restart: code = krb5_cc_store_cred(kparam.context, kparam.cc, creds); if (code) { debugs(11, 5, - HERE << "Error while storing credentials : " << + "Error while storing credentials : " << error_message(code)); return (1); } @@ -513,19 +513,19 @@ char *peer_proxy_negotiate_auth(char *principal_name, char *proxy, int flags) { setbuf(stdin, NULL); if (!proxy) { - debugs(11, 5, HERE << "Error : No proxy server name"); + debugs(11, 5, "Error : No proxy server name"); return NULL; } if (!(flags & PEER_PROXY_NEGOTIATE_NOKEYTAB)) { if (principal_name) debugs(11, 5, - HERE << "Creating credential cache for " << principal_name); + "Creating credential cache for " << principal_name); else - debugs(11, 5, HERE << "Creating credential cache"); + debugs(11, 5, "Creating credential cache"); rc = krb5_create_cache(NULL, principal_name); if (rc) { - debugs(11, 5, HERE << "Error : Failed to create Kerberos cache"); + debugs(11, 5, "Error : Failed to create Kerberos cache"); krb5_cleanup(); return NULL; } @@ -536,14 +536,14 @@ char *peer_proxy_negotiate_auth(char *principal_name, char *proxy, int flags) { "%s@%s", "HTTP", proxy); service.length = strlen((char *) service.value); - debugs(11, 5, HERE << "Import gss name"); + debugs(11, 5, "Import gss name"); major_status = gss_import_name(&minor_status, &service, gss_nt_service_name, &server_name); if (check_gss_err(major_status, minor_status, "gss_import_name()")) goto cleanup; - debugs(11, 5, HERE << "Initialize gss security context"); + debugs(11, 5, "Initialize gss security context"); major_status = gss_init_sec_context(&minor_status, GSS_C_NO_CREDENTIAL, &gss_context, @@ -557,7 +557,7 @@ char *peer_proxy_negotiate_auth(char *principal_name, char *proxy, int flags) { if (check_gss_err(major_status, minor_status, "gss_init_sec_context()")) goto cleanup; - debugs(11, 5, HERE << "Got token with length " << output_token.length); + debugs(11, 5, "Got token with length " << output_token.length); if (output_token.length) { static char b64buf[8192]; // XXX: 8KB only because base64_encode_bin() used to. struct base64_encode_ctx ctx; diff --git a/src/peer_proxy_negotiate_auth.h b/src/peer_proxy_negotiate_auth.h index aae5e678fb..2e1546a530 100644 --- a/src/peer_proxy_negotiate_auth.h +++ b/src/peer_proxy_negotiate_auth.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/peer_select.cc b/src/peer_select.cc index 68fde24006..017b4cbcc3 100644 --- a/src/peer_select.cc +++ b/src/peer_select.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/peer_sourcehash.cc b/src/peer_sourcehash.cc index 6713a99e00..7e2ed5e923 100644 --- a/src/peer_sourcehash.cc +++ b/src/peer_sourcehash.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/peer_sourcehash.h b/src/peer_sourcehash.h index d392f295bf..e8a482e0b7 100644 --- a/src/peer_sourcehash.h +++ b/src/peer_sourcehash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc index ade4cb8a29..2da9824453 100644 --- a/src/peer_userhash.cc +++ b/src/peer_userhash.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/peer_userhash.h b/src/peer_userhash.h index f68d34d6ec..cc2f4dccc5 100644 --- a/src/peer_userhash.h +++ b/src/peer_userhash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/protos.h b/src/protos.h index 73ec8318a0..f0d237e7cf 100644 --- a/src/protos.h +++ b/src/protos.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/proxyp/Elements.cc b/src/proxyp/Elements.cc index 9c52f7a2f3..50a7d22d2e 100644 --- a/src/proxyp/Elements.cc +++ b/src/proxyp/Elements.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/proxyp/Elements.h b/src/proxyp/Elements.h index cf721699ee..ee34644e9d 100644 --- a/src/proxyp/Elements.h +++ b/src/proxyp/Elements.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/proxyp/Header.cc b/src/proxyp/Header.cc index a6094692be..0d2d954981 100644 --- a/src/proxyp/Header.cc +++ b/src/proxyp/Header.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/proxyp/Header.h b/src/proxyp/Header.h index 7f8cc97a61..024d1a98f6 100644 --- a/src/proxyp/Header.h +++ b/src/proxyp/Header.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/proxyp/Makefile.am b/src/proxyp/Makefile.am index cf1e0cfe46..119ca53447 100644 --- a/src/proxyp/Makefile.am +++ b/src/proxyp/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/proxyp/Parser.cc b/src/proxyp/Parser.cc index 2f358a7d60..04513cfbdc 100644 --- a/src/proxyp/Parser.cc +++ b/src/proxyp/Parser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/proxyp/Parser.h b/src/proxyp/Parser.h index eb202d04cb..0ed0fdc618 100644 --- a/src/proxyp/Parser.h +++ b/src/proxyp/Parser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/proxyp/forward.h b/src/proxyp/forward.h index 29c82fb143..1dc744f784 100644 --- a/src/proxyp/forward.h +++ b/src/proxyp/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/redirect.cc b/src/redirect.cc index 4fe9f9bf32..fc6bfd2404 100644 --- a/src/redirect.cc +++ b/src/redirect.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -80,7 +80,7 @@ static void redirectHandleReply(void *data, const Helper::Reply &reply) { RedirectStateData *r = static_cast(data); - debugs(61, 5, HERE << "reply=" << reply); + debugs(61, 5, "reply=" << reply); // XXX: This function is now kept only to check for and display the garbage use-case // and to map the old helper response format(s) into new format result code and key=value pairs @@ -275,7 +275,7 @@ constructHelperQuery(const char *name, helper *hlp, HLPCB *replyHandler, ClientH return; } - debugs(61,6, HERE << "sending '" << buf << "' to the " << name << " helper"); + debugs(61,6, "sending '" << buf << "' to the " << name << " helper"); helperSubmit(hlp, buf, replyHandler, r); } diff --git a/src/redirect.h b/src/redirect.h index e2efc0587e..e6304378ea 100644 --- a/src/redirect.h +++ b/src/redirect.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/refresh.cc b/src/refresh.cc index 49e8694355..1207646c87 100644 --- a/src/refresh.cc +++ b/src/refresh.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/refresh.h b/src/refresh.h index 7afb828864..e7fa291f2d 100644 --- a/src/refresh.h +++ b/src/refresh.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am index 0ec19b5b44..6ba58ef1e0 100644 --- a/src/repl/Makefile.am +++ b/src/repl/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/repl/heap/store_heap_replacement.cc b/src/repl/heap/store_heap_replacement.cc index aa67bc9040..793166361e 100644 --- a/src/repl/heap/store_heap_replacement.cc +++ b/src/repl/heap/store_heap_replacement.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/repl/heap/store_heap_replacement.h b/src/repl/heap/store_heap_replacement.h index 5ebda23c83..8c8d42d015 100644 --- a/src/repl/heap/store_heap_replacement.h +++ b/src/repl/heap/store_heap_replacement.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/repl/heap/store_repl_heap.cc b/src/repl/heap/store_repl_heap.cc index 00f3f18c66..db2017c55a 100644 --- a/src/repl/heap/store_repl_heap.cc +++ b/src/repl/heap/store_repl_heap.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/repl/lru/store_repl_lru.cc b/src/repl/lru/store_repl_lru.cc index e51e047b9e..0e5767c1fe 100644 --- a/src/repl/lru/store_repl_lru.cc +++ b/src/repl/lru/store_repl_lru.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/repl_modules.h b/src/repl_modules.h index e4c97a3050..df6d43683d 100644 --- a/src/repl_modules.h +++ b/src/repl_modules.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/repl_modules.sh b/src/repl_modules.sh index 1f0e02b41b..2826afa4c5 100755 --- a/src/repl_modules.sh +++ b/src/repl_modules.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/sbuf/Algorithms.cc b/src/sbuf/Algorithms.cc index f4542aa005..3fa2756094 100644 --- a/src/sbuf/Algorithms.cc +++ b/src/sbuf/Algorithms.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/Algorithms.h b/src/sbuf/Algorithms.h index 173bd543e5..d7159fa9e5 100644 --- a/src/sbuf/Algorithms.h +++ b/src/sbuf/Algorithms.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/DetailedStats.cc b/src/sbuf/DetailedStats.cc index 92406a5e50..9f0d3e9899 100644 --- a/src/sbuf/DetailedStats.cc +++ b/src/sbuf/DetailedStats.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/DetailedStats.h b/src/sbuf/DetailedStats.h index 436c118b40..8d13c529d0 100644 --- a/src/sbuf/DetailedStats.h +++ b/src/sbuf/DetailedStats.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/List.cc b/src/sbuf/List.cc index 03b2e5b240..b1d2b77e6f 100644 --- a/src/sbuf/List.cc +++ b/src/sbuf/List.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/List.h b/src/sbuf/List.h index e1acebd24d..23f8b4fabf 100644 --- a/src/sbuf/List.h +++ b/src/sbuf/List.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/Makefile.am b/src/sbuf/Makefile.am index 5e41179502..4b8c2f0e01 100644 --- a/src/sbuf/Makefile.am +++ b/src/sbuf/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/sbuf/MemBlob.cc b/src/sbuf/MemBlob.cc index dd72ce429a..f9dae0992e 100644 --- a/src/sbuf/MemBlob.cc +++ b/src/sbuf/MemBlob.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -51,7 +51,7 @@ MemBlobStats::dump(std::ostream &os) const MemBlob::MemBlob(const MemBlob::size_type reserveSize) : mem(NULL), capacity(0), size(0) // will be set by memAlloc { - debugs(MEMBLOB_DEBUGSECTION,9, HERE << "constructed, this=" + debugs(MEMBLOB_DEBUGSECTION,9, "constructed, this=" << static_cast(this) << " id=" << id << " reserveSize=" << reserveSize); memAlloc(reserveSize); @@ -60,7 +60,7 @@ MemBlob::MemBlob(const MemBlob::size_type reserveSize) : MemBlob::MemBlob(const char *buffer, const MemBlob::size_type bufSize) : mem(NULL), capacity(0), size(0) // will be set by memAlloc { - debugs(MEMBLOB_DEBUGSECTION,9, HERE << "constructed, this=" + debugs(MEMBLOB_DEBUGSECTION,9, "constructed, this=" << static_cast(this) << " id=" << id << " buffer=" << static_cast(buffer) << " bufSize=" << bufSize); @@ -76,7 +76,7 @@ MemBlob::~MemBlob() --Stats.live; recordMemBlobSizeAtDestruct(capacity); - debugs(MEMBLOB_DEBUGSECTION,9, HERE << "destructed, this=" + debugs(MEMBLOB_DEBUGSECTION,9, "destructed, this=" << static_cast(this) << " id=" << id << " capacity=" << capacity << " size=" << size); diff --git a/src/sbuf/MemBlob.h b/src/sbuf/MemBlob.h index 12115381f8..8a40392c75 100644 --- a/src/sbuf/MemBlob.h +++ b/src/sbuf/MemBlob.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/SBuf.cc b/src/sbuf/SBuf.cc index f35971d83d..4f1b438ddf 100644 --- a/src/sbuf/SBuf.cc +++ b/src/sbuf/SBuf.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/SBuf.h b/src/sbuf/SBuf.h index be916a8480..d02f29cfc0 100644 --- a/src/sbuf/SBuf.h +++ b/src/sbuf/SBuf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/Stats.cc b/src/sbuf/Stats.cc index 3ef6874fa4..0d884990cb 100644 --- a/src/sbuf/Stats.cc +++ b/src/sbuf/Stats.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/Stats.h b/src/sbuf/Stats.h index dd144d2a19..833decd8ef 100644 --- a/src/sbuf/Stats.h +++ b/src/sbuf/Stats.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/Stream.h b/src/sbuf/Stream.h index 5359ba94f3..5d550980f1 100644 --- a/src/sbuf/Stream.h +++ b/src/sbuf/Stream.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -9,8 +9,8 @@ #ifndef SQUID_SBUFSTREAM_H #define SQUID_SBUFSTREAM_H -#include "sbuf/SBuf.h" #include "base/PackableStream.h" +#include "sbuf/SBuf.h" /** Stream interface to write to a SBuf. * diff --git a/src/sbuf/StringConvert.h b/src/sbuf/StringConvert.h index a88ba77c3c..ca24d09066 100644 --- a/src/sbuf/StringConvert.h +++ b/src/sbuf/StringConvert.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/sbuf/forward.h b/src/sbuf/forward.h index 5b25e77539..c05beac986 100644 --- a/src/sbuf/forward.h +++ b/src/sbuf/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/BlindPeerConnector.cc b/src/security/BlindPeerConnector.cc index b86b960ad3..d0d1c4a9eb 100644 --- a/src/security/BlindPeerConnector.cc +++ b/src/security/BlindPeerConnector.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/BlindPeerConnector.h b/src/security/BlindPeerConnector.h index 1710a66918..37e2fc500e 100644 --- a/src/security/BlindPeerConnector.h +++ b/src/security/BlindPeerConnector.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/CertError.h b/src/security/CertError.h index 653c99b10c..f2069d9f9d 100644 --- a/src/security/CertError.h +++ b/src/security/CertError.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/CommunicationSecrets.cc b/src/security/CommunicationSecrets.cc index 5f75db3f7e..c6f02eb245 100644 --- a/src/security/CommunicationSecrets.cc +++ b/src/security/CommunicationSecrets.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/CommunicationSecrets.h b/src/security/CommunicationSecrets.h index c21b1e3243..685dab72a6 100644 --- a/src/security/CommunicationSecrets.h +++ b/src/security/CommunicationSecrets.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/Context.h b/src/security/Context.h index 02a748bf07..e4332eab1c 100644 --- a/src/security/Context.h +++ b/src/security/Context.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/EncryptorAnswer.cc b/src/security/EncryptorAnswer.cc index f18024c4f7..99b35db2ff 100644 --- a/src/security/EncryptorAnswer.cc +++ b/src/security/EncryptorAnswer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/EncryptorAnswer.h b/src/security/EncryptorAnswer.h index d481bf6399..a0dd150bb0 100644 --- a/src/security/EncryptorAnswer.h +++ b/src/security/EncryptorAnswer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/ErrorDetail.cc b/src/security/ErrorDetail.cc index 0f64f67d17..8c10408dbd 100644 --- a/src/security/ErrorDetail.cc +++ b/src/security/ErrorDetail.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/ErrorDetail.h b/src/security/ErrorDetail.h index 0583ef2456..a103b5b31d 100644 --- a/src/security/ErrorDetail.h +++ b/src/security/ErrorDetail.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/Handshake.cc b/src/security/Handshake.cc index 7adefa5f18..dbf0544c76 100644 --- a/src/security/Handshake.cc +++ b/src/security/Handshake.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/Handshake.h b/src/security/Handshake.h index dda5cbbb9a..9ead634c61 100644 --- a/src/security/Handshake.h +++ b/src/security/Handshake.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/Io.cc b/src/security/Io.cc index 7c3aa13ce2..f8f2745e38 100644 --- a/src/security/Io.cc +++ b/src/security/Io.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/Io.h b/src/security/Io.h index 5b1b1e250d..9307237b8f 100644 --- a/src/security/Io.h +++ b/src/security/Io.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyData.cc b/src/security/KeyData.cc index cc51c6c847..b5ded80a1b 100644 --- a/src/security/KeyData.cc +++ b/src/security/KeyData.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyData.h b/src/security/KeyData.h index 63aac7496f..97bbc72c2a 100644 --- a/src/security/KeyData.h +++ b/src/security/KeyData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyLog.cc b/src/security/KeyLog.cc index bf165c7fcd..56048c3572 100644 --- a/src/security/KeyLog.cc +++ b/src/security/KeyLog.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyLog.h b/src/security/KeyLog.h index 95afe2f91f..d9a28dccd4 100644 --- a/src/security/KeyLog.h +++ b/src/security/KeyLog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyLogger.cc b/src/security/KeyLogger.cc index 623623b9e8..c07889fb99 100644 --- a/src/security/KeyLogger.cc +++ b/src/security/KeyLogger.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/KeyLogger.h b/src/security/KeyLogger.h index 30afed9480..7c854a5ab3 100644 --- a/src/security/KeyLogger.h +++ b/src/security/KeyLogger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/LockingPointer.h b/src/security/LockingPointer.h index 6596dbff39..b6f6e8a53a 100644 --- a/src/security/LockingPointer.h +++ b/src/security/LockingPointer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/Makefile.am b/src/security/Makefile.am index 88cf3fb7b5..e483bd55f7 100644 --- a/src/security/Makefile.am +++ b/src/security/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/security/NegotiationHistory.cc b/src/security/NegotiationHistory.cc index 56deeb8693..02cb623e1d 100644 --- a/src/security/NegotiationHistory.cc +++ b/src/security/NegotiationHistory.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/NegotiationHistory.h b/src/security/NegotiationHistory.h index d2d6cff3e3..2bb4550dd2 100644 --- a/src/security/NegotiationHistory.h +++ b/src/security/NegotiationHistory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/PeerConnector.cc b/src/security/PeerConnector.cc index e4ffff64a9..51523b9b8f 100644 --- a/src/security/PeerConnector.cc +++ b/src/security/PeerConnector.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/PeerConnector.h b/src/security/PeerConnector.h index e9e61db129..c5e58dffce 100644 --- a/src/security/PeerConnector.h +++ b/src/security/PeerConnector.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/PeerOptions.cc b/src/security/PeerOptions.cc index 5f5dffddc7..3c290b3244 100644 --- a/src/security/PeerOptions.cc +++ b/src/security/PeerOptions.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/PeerOptions.h b/src/security/PeerOptions.h index c5d5b8819d..aca4800c8a 100644 --- a/src/security/PeerOptions.h +++ b/src/security/PeerOptions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/ServerOptions.cc b/src/security/ServerOptions.cc index b6849a0876..1d0d8945b9 100644 --- a/src/security/ServerOptions.cc +++ b/src/security/ServerOptions.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/ServerOptions.h b/src/security/ServerOptions.h index da4a445419..b7abd4e60e 100644 --- a/src/security/ServerOptions.h +++ b/src/security/ServerOptions.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/Session.cc b/src/security/Session.cc index 38fe2adc2b..5aaff22690 100644 --- a/src/security/Session.cc +++ b/src/security/Session.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/Session.h b/src/security/Session.h index 0c4662dd89..082d89723f 100644 --- a/src/security/Session.h +++ b/src/security/Session.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/cert_generators/Makefile.am b/src/security/cert_generators/Makefile.am index d4e761a9c1..6800a7042e 100644 --- a/src/security/cert_generators/Makefile.am +++ b/src/security/cert_generators/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/security/cert_generators/file/Makefile.am b/src/security/cert_generators/file/Makefile.am index 3cb3204c5d..565f5b3eb9 100644 --- a/src/security/cert_generators/file/Makefile.am +++ b/src/security/cert_generators/file/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/security/cert_generators/file/certificate_db.cc b/src/security/cert_generators/file/certificate_db.cc index e631413052..ac8c3b25de 100644 --- a/src/security/cert_generators/file/certificate_db.cc +++ b/src/security/cert_generators/file/certificate_db.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/cert_generators/file/certificate_db.h b/src/security/cert_generators/file/certificate_db.h index d3bc547973..2d6ed1db99 100644 --- a/src/security/cert_generators/file/certificate_db.h +++ b/src/security/cert_generators/file/certificate_db.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/cert_generators/file/required.m4 b/src/security/cert_generators/file/required.m4 index 877d9cc829..1187158a30 100644 --- a/src/security/cert_generators/file/required.m4 +++ b/src/security/cert_generators/file/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/security/cert_generators/file/security_file_certgen.8.in b/src/security/cert_generators/file/security_file_certgen.8.in index ab11e42d0d..2b26792e15 100644 --- a/src/security/cert_generators/file/security_file_certgen.8.in +++ b/src/security/cert_generators/file/security_file_certgen.8.in @@ -157,7 +157,7 @@ and . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/cert_generators/file/security_file_certgen.cc b/src/security/cert_generators/file/security_file_certgen.cc index 413a200d49..5b96dc6708 100644 --- a/src/security/cert_generators/file/security_file_certgen.cc +++ b/src/security/cert_generators/file/security_file_certgen.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/cert_generators/helpers.m4 b/src/security/cert_generators/helpers.m4 index 7fec511c6f..538c2abfa8 100644 --- a/src/security/cert_generators/helpers.m4 +++ b/src/security/cert_generators/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/security/cert_validators/Makefile.am b/src/security/cert_validators/Makefile.am index 92dafefdb2..2d34c76cfc 100644 --- a/src/security/cert_validators/Makefile.am +++ b/src/security/cert_validators/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/security/cert_validators/fake/Makefile.am b/src/security/cert_validators/fake/Makefile.am index d5eaf5f637..59bde9f414 100644 --- a/src/security/cert_validators/fake/Makefile.am +++ b/src/security/cert_validators/fake/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/security/cert_validators/fake/required.m4 b/src/security/cert_validators/fake/required.m4 index 891fe0c6b2..5aa8b04109 100755 --- a/src/security/cert_validators/fake/required.m4 +++ b/src/security/cert_validators/fake/required.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/security/cert_validators/fake/security_fake_certverify.pl.in b/src/security/cert_validators/fake/security_fake_certverify.pl.in index 2b665a38ec..81dff7e6eb 100755 --- a/src/security/cert_validators/fake/security_fake_certverify.pl.in +++ b/src/security/cert_validators/fake/security_fake_certverify.pl.in @@ -46,7 +46,7 @@ I> =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/security/cert_validators/helpers.m4 b/src/security/cert_validators/helpers.m4 index 3cf2854e25..ed558dd9a3 100644 --- a/src/security/cert_validators/helpers.m4 +++ b/src/security/cert_validators/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/security/forward.h b/src/security/forward.h index 7cf1c5eb5a..efb840871f 100644 --- a/src/security/forward.h +++ b/src/security/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/send-announce.cc b/src/send-announce.cc index ebd5498a7b..859900247c 100644 --- a/src/send-announce.cc +++ b/src/send-announce.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/send-announce.h b/src/send-announce.h index 181c2f0f99..6dd74edc18 100644 --- a/src/send-announce.h +++ b/src/send-announce.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/servers/FtpServer.cc b/src/servers/FtpServer.cc index 8a14144917..d22148c5a0 100644 --- a/src/servers/FtpServer.cc +++ b/src/servers/FtpServer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/servers/FtpServer.h b/src/servers/FtpServer.h index bcc3b1746a..c1af047891 100644 --- a/src/servers/FtpServer.h +++ b/src/servers/FtpServer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/servers/Http1Server.cc b/src/servers/Http1Server.cc index 06a31f342f..c672d226e6 100644 --- a/src/servers/Http1Server.cc +++ b/src/servers/Http1Server.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/servers/Http1Server.h b/src/servers/Http1Server.h index 1dde748858..a69751c2d8 100644 --- a/src/servers/Http1Server.h +++ b/src/servers/Http1Server.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/servers/Makefile.am b/src/servers/Makefile.am index 2cd59f2748..f6b40c178d 100644 --- a/src/servers/Makefile.am +++ b/src/servers/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/servers/Server.cc b/src/servers/Server.cc index 736365b0ea..fec88dfaa4 100644 --- a/src/servers/Server.cc +++ b/src/servers/Server.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/servers/Server.h b/src/servers/Server.h index ba2bba1286..ef105f5028 100644 --- a/src/servers/Server.h +++ b/src/servers/Server.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/servers/forward.h b/src/servers/forward.h index 592b0268ed..4cdbe85f57 100644 --- a/src/servers/forward.h +++ b/src/servers/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Forwarder.cc b/src/snmp/Forwarder.cc index c120976f96..3b4c1a5fd2 100644 --- a/src/snmp/Forwarder.cc +++ b/src/snmp/Forwarder.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -26,7 +26,7 @@ Snmp::Forwarder::Forwarder(const Pdu& aPdu, const Session& aSession, int aFd, Ipc::Forwarder(new Request(KidIdentifier, Ipc::RequestId(), aPdu, aSession, aFd, anAddress), 2), fd(aFd) { - debugs(49, 5, HERE << "FD " << aFd); + debugs(49, 5, "FD " << aFd); Must(fd >= 0); closer = asyncCall(49, 5, "Snmp::Forwarder::noteCommClosed", CommCbMemFunT(this, &Forwarder::noteCommClosed)); @@ -51,7 +51,7 @@ Snmp::Forwarder::swanSong() void Snmp::Forwarder::noteCommClosed(const CommCloseCbParams& params) { - debugs(49, 5, HERE); + debugs(49, 5, MYNAME); Must(fd == params.fd); closer = nullptr; fd = -1; @@ -68,7 +68,7 @@ Snmp::Forwarder::handleTimeout() void Snmp::Forwarder::handleException(const std::exception& e) { - debugs(49, 3, HERE << e.what()); + debugs(49, 3, e.what()); sendError(SNMP_ERR_GENERR); Ipc::Forwarder::handleException(e); } @@ -77,7 +77,7 @@ Snmp::Forwarder::handleException(const std::exception& e) void Snmp::Forwarder::sendError(int error) { - debugs(49, 3, HERE); + debugs(49, 3, MYNAME); if (fd < 0) return; // client gone @@ -94,7 +94,7 @@ Snmp::Forwarder::sendError(int error) void Snmp::SendResponse(const Ipc::RequestId requestId, const Pdu &pdu) { - debugs(49, 5, HERE); + debugs(49, 5, MYNAME); // snmpAgentResponse() can modify arg Pdu tmp = pdu; Snmp::Response response(requestId); @@ -105,7 +105,7 @@ Snmp::SendResponse(const Ipc::RequestId requestId, const Pdu &pdu) response.pdu = static_cast(*response_pdu); snmp_free_pdu(response_pdu); } catch (const std::exception& e) { - debugs(49, DBG_CRITICAL, HERE << e.what()); + debugs(49, DBG_CRITICAL, e.what()); response.pdu.command = SNMP_PDU_RESPONSE; response.pdu.errstat = SNMP_ERR_GENERR; } diff --git a/src/snmp/Forwarder.h b/src/snmp/Forwarder.h index 7d415af346..d5e9841a41 100644 --- a/src/snmp/Forwarder.h +++ b/src/snmp/Forwarder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Inquirer.cc b/src/snmp/Inquirer.cc index a9d93bca98..df47ad4de1 100644 --- a/src/snmp/Inquirer.cc +++ b/src/snmp/Inquirer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -29,7 +29,7 @@ Snmp::Inquirer::Inquirer(const Request& aRequest, const Ipc::StrandCoords& coord conn->fd = aRequest.fd; ImportFdIntoComm(conn, SOCK_DGRAM, IPPROTO_UDP, Ipc::fdnInSnmpSocket); - debugs(49, 5, HERE); + debugs(49, 5, MYNAME); closer = asyncCall(49, 5, "Snmp::Inquirer::noteCommClosed", CommCbMemFunT(this, &Inquirer::noteCommClosed)); comm_add_close_handler(conn->fd, closer); @@ -56,7 +56,7 @@ Snmp::Inquirer::cleanup() void Snmp::Inquirer::start() { - debugs(49, 5, HERE); + debugs(49, 5, MYNAME); Ipc::Inquirer::start(); Must(Comm::IsConnOpen(conn)); inquire(); @@ -86,7 +86,7 @@ Snmp::Inquirer::aggregate(Response::Pointer aResponse) void Snmp::Inquirer::noteCommClosed(const CommCloseCbParams& params) { - debugs(49, 5, HERE); + debugs(49, 5, MYNAME); Must(!Comm::IsConnOpen(conn) || conn->fd == params.conn->fd); closer = nullptr; if (conn) { @@ -105,7 +105,7 @@ Snmp::Inquirer::doneAll() const void Snmp::Inquirer::sendResponse() { - debugs(49, 5, HERE); + debugs(49, 5, MYNAME); if (!Comm::IsConnOpen(conn)) return; // client gone diff --git a/src/snmp/Inquirer.h b/src/snmp/Inquirer.h index 3b8ad11fde..7ea033f1da 100644 --- a/src/snmp/Inquirer.h +++ b/src/snmp/Inquirer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Makefile.am b/src/snmp/Makefile.am index 7d0e15dfb8..29d5168d23 100644 --- a/src/snmp/Makefile.am +++ b/src/snmp/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/snmp/Pdu.cc b/src/snmp/Pdu.cc index 41f31d9ddd..978e4fd507 100644 --- a/src/snmp/Pdu.cc +++ b/src/snmp/Pdu.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Pdu.h b/src/snmp/Pdu.h index 84ca89ea2d..63d13a804e 100644 --- a/src/snmp/Pdu.h +++ b/src/snmp/Pdu.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Request.cc b/src/snmp/Request.cc index b21aa3958e..3d21a5fc18 100644 --- a/src/snmp/Request.cc +++ b/src/snmp/Request.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Request.h b/src/snmp/Request.h index dd230ebf82..89220e42d0 100644 --- a/src/snmp/Request.h +++ b/src/snmp/Request.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Response.cc b/src/snmp/Response.cc index baa8fadf6a..1517851dbb 100644 --- a/src/snmp/Response.cc +++ b/src/snmp/Response.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Response.h b/src/snmp/Response.h index 52c6daf497..dbe8668e9b 100644 --- a/src/snmp/Response.h +++ b/src/snmp/Response.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Session.cc b/src/snmp/Session.cc index dc129eae60..85d2388134 100644 --- a/src/snmp/Session.cc +++ b/src/snmp/Session.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Session.h b/src/snmp/Session.h index 3bd43f62ea..92b3675553 100644 --- a/src/snmp/Session.h +++ b/src/snmp/Session.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Var.cc b/src/snmp/Var.cc index 75eb4af874..f0f54e7bde 100644 --- a/src/snmp/Var.cc +++ b/src/snmp/Var.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/Var.h b/src/snmp/Var.h index 0240c7a4c5..07b1b1bca4 100644 --- a/src/snmp/Var.h +++ b/src/snmp/Var.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp/forward.h b/src/snmp/forward.h index b440bf50f7..d4c9aa21cc 100644 --- a/src/snmp/forward.h +++ b/src/snmp/forward.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc index b8d7a22a89..ca93bd2c20 100644 --- a/src/snmp_agent.cc +++ b/src/snmp_agent.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp_agent.h b/src/snmp_agent.h index 869c661fc2..18cae5f0b0 100644 --- a/src/snmp_agent.h +++ b/src/snmp_agent.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/snmp_core.cc b/src/snmp_core.cc index 7345477352..cb847f8a24 100644 --- a/src/snmp_core.cc +++ b/src/snmp_core.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -389,7 +389,7 @@ snmpDecodePacket(SnmpRequest * rq) return; } - debugs(49, 5, HERE << "Called."); + debugs(49, 5, "Called."); PDU = snmp_pdu_create(0); /* Always answer on SNMPv1 */ rq->session.Version = SNMP_VERSION_1; @@ -568,7 +568,7 @@ snmpTreeGet(oid * Current, snint CurrentLen) AggrType snmpAggrType(oid* Current, snint CurrentLen) { - debugs(49, 5, HERE); + debugs(49, 5, MYNAME); mib_tree_entry* mibTreeEntry = mib_tree_head; AggrType type = atNone; @@ -781,7 +781,7 @@ client_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn else size = sizeof(in6_addr); - debugs(49, 6, HERE << "len" << *len << ", current-len" << current->len << ", addr=" << laddr << ", size=" << size); + debugs(49, 6, "len" << *len << ", current-len" << current->len << ", addr=" << laddr << ", size=" << size); instance = (oid *)xmalloc(sizeof(*name) * (*len + size )); memcpy(instance, name, (sizeof(*name) * (*len))); @@ -805,7 +805,7 @@ client_Inst(oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn else newshift = sizeof(in6_addr); - debugs(49, 6, HERE << "len" << *len << ", current-len" << current->len << ", addr=" << laddr << ", newshift=" << newshift); + debugs(49, 6, "len" << *len << ", current-len" << current->len << ", addr=" << laddr << ", newshift=" << newshift); instance = (oid *)xmalloc(sizeof(*name) * (current->len + newshift)); memcpy(instance, name, (sizeof(*name) * (current->len))); diff --git a/src/snmp_core.h b/src/snmp_core.h index fa7eb5e7f1..21acf5c1a6 100644 --- a/src/snmp_core.h +++ b/src/snmp_core.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/squid.8.in b/src/squid.8.in index e4bcac1ba4..7b5bd8ad0f 100644 --- a/src/squid.8.in +++ b/src/squid.8.in @@ -256,7 +256,7 @@ see CREDITS for a list of major code contributing copyright holders. . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/Config.cc b/src/ssl/Config.cc index d38900bf21..3ff1dbbb53 100644 --- a/src/ssl/Config.cc +++ b/src/ssl/Config.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/Config.h b/src/ssl/Config.h index 5ddd002fa1..3bae0d4dac 100644 --- a/src/ssl/Config.h +++ b/src/ssl/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/ErrorDetail.cc b/src/ssl/ErrorDetail.cc index 034139a0f4..c97fdb2c29 100644 --- a/src/ssl/ErrorDetail.cc +++ b/src/ssl/ErrorDetail.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/ErrorDetail.h b/src/ssl/ErrorDetail.h index c53cea71ea..da4771b6de 100644 --- a/src/ssl/ErrorDetail.h +++ b/src/ssl/ErrorDetail.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc index 4195192091..44a605e9e5 100644 --- a/src/ssl/ErrorDetailManager.cc +++ b/src/ssl/ErrorDetailManager.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -106,7 +106,7 @@ Ssl::ErrorDetailsList::Pointer Ssl::ErrorDetailsManager::getCachedDetails(const Cache::iterator it; it = cache.find(lang); if (it != cache.end()) { - debugs(83, 8, HERE << "Found template details in cache for language: " << lang); + debugs(83, 8, "Found template details in cache for language: " << lang); return it->second; } @@ -136,12 +136,12 @@ Ssl::ErrorDetailsManager::getErrorDetail(Security::ErrorCode value, const HttpRe errDetails = getCachedDetails(lang); // search in cache if (!errDetails) { // Else try to load from disk - debugs(83, 8, HERE << "Creating new ErrDetailList to read from disk"); + debugs(83, 8, "Creating new ErrDetailList to read from disk"); errDetails = new ErrorDetailsList(); ErrorDetailFile detailTmpl(errDetails); if (detailTmpl.loadFor(request.getRaw())) { if (detailTmpl.language()) { - debugs(83, 8, HERE << "Found details on disk for language " << detailTmpl.language()); + debugs(83, 8, "Found details on disk for language " << detailTmpl.language()); errDetails->errLanguage = detailTmpl.language(); cacheDetails(errDetails); } @@ -157,7 +157,7 @@ Ssl::ErrorDetailsManager::getErrorDetail(Security::ErrorCode value, const HttpRe // else try the default if (theDefaultErrorDetails->getRecord(value, entry)) { - debugs(83, 8, HERE << "Found default details record for error: " << GetErrorName(value)); + debugs(83, 8, "Found default details record for error: " << GetErrorName(value)); return true; } diff --git a/src/ssl/ErrorDetailManager.h b/src/ssl/ErrorDetailManager.h index 523ed29351..fcbfac4e31 100644 --- a/src/ssl/ErrorDetailManager.h +++ b/src/ssl/ErrorDetailManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/Makefile.am b/src/ssl/Makefile.am index 179ec4e8b0..745f71ffd5 100644 --- a/src/ssl/Makefile.am +++ b/src/ssl/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/ssl/PeekingPeerConnector.cc b/src/ssl/PeekingPeerConnector.cc index 2cc422a510..879f7ed745 100644 --- a/src/ssl/PeekingPeerConnector.cc +++ b/src/ssl/PeekingPeerConnector.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/PeekingPeerConnector.h b/src/ssl/PeekingPeerConnector.h index 944ff24c13..b50899d90c 100644 --- a/src/ssl/PeekingPeerConnector.h +++ b/src/ssl/PeekingPeerConnector.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/ProxyCerts.h b/src/ssl/ProxyCerts.h index d5ade7c2ee..711beb5f38 100644 --- a/src/ssl/ProxyCerts.h +++ b/src/ssl/ProxyCerts.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/ServerBump.cc b/src/ssl/ServerBump.cc index 40e49b8598..0313be2860 100644 --- a/src/ssl/ServerBump.cc +++ b/src/ssl/ServerBump.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -48,9 +48,9 @@ Ssl::ServerBump::ServerBump(ClientHttpRequest *http, StoreEntry *e, Ssl::BumpMod Ssl::ServerBump::~ServerBump() { - debugs(33, 4, HERE << "destroying"); + debugs(33, 4, "destroying"); if (entry) { - debugs(33, 4, HERE << *entry); + debugs(33, 4, *entry); storeUnregister(sc, entry, this); entry->unlock("Ssl::ServerBump"); } diff --git a/src/ssl/ServerBump.h b/src/ssl/ServerBump.h index 3aa5b44244..e7ac2ca99f 100644 --- a/src/ssl/ServerBump.h +++ b/src/ssl/ServerBump.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/bio.cc b/src/ssl/bio.cc index dd7d8539e4..55de1fc929 100644 --- a/src/ssl/bio.cc +++ b/src/ssl/bio.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/bio.h b/src/ssl/bio.h index cf9c74125d..f50f64cb09 100644 --- a/src/ssl/bio.h +++ b/src/ssl/bio.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/cert_validate_message.cc b/src/ssl/cert_validate_message.cc index 33f1251384..b7b691eaa3 100644 --- a/src/ssl/cert_validate_message.cc +++ b/src/ssl/cert_validate_message.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/cert_validate_message.h b/src/ssl/cert_validate_message.h index 70c85af923..87a5b48624 100644 --- a/src/ssl/cert_validate_message.h +++ b/src/ssl/cert_validate_message.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/context_storage.cc b/src/ssl/context_storage.cc index 73a4db795a..657f7c91e1 100644 --- a/src/ssl/context_storage.cc +++ b/src/ssl/context_storage.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/context_storage.h b/src/ssl/context_storage.h index 541cf718c6..cc59a1a0ad 100644 --- a/src/ssl/context_storage.h +++ b/src/ssl/context_storage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/crtd_message.cc b/src/ssl/crtd_message.cc index 6b2e1b014b..e96e35a0fe 100644 --- a/src/ssl/crtd_message.cc +++ b/src/ssl/crtd_message.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/crtd_message.h b/src/ssl/crtd_message.h index 99fa0f8b9b..6e9bfe2549 100644 --- a/src/ssl/crtd_message.h +++ b/src/ssl/crtd_message.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/gadgets.cc b/src/ssl/gadgets.cc index 6d89e6e44e..e836546b7c 100644 --- a/src/ssl/gadgets.cc +++ b/src/ssl/gadgets.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/gadgets.h b/src/ssl/gadgets.h index 062c1b0aee..3c4de81b07 100644 --- a/src/ssl/gadgets.h +++ b/src/ssl/gadgets.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc index f991001586..91ee78bc10 100644 --- a/src/ssl/helper.cc +++ b/src/ssl/helper.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/helper.h b/src/ssl/helper.h index 260164e02e..42e9215be3 100644 --- a/src/ssl/helper.h +++ b/src/ssl/helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/stub_libsslutil.cc b/src/ssl/stub_libsslutil.cc index 505e13db2b..ffd4fbb1b6 100644 --- a/src/ssl/stub_libsslutil.cc +++ b/src/ssl/stub_libsslutil.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/support.cc b/src/ssl/support.cc index 83eee2dde1..1b402791bf 100644 --- a/src/ssl/support.cc +++ b/src/ssl/support.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ssl/support.h b/src/ssl/support.h index b35584579d..5b284daa05 100644 --- a/src/ssl/support.h +++ b/src/ssl/support.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/stat.cc b/src/stat.cc index f50b20b543..7ccabe98ee 100644 --- a/src/stat.cc +++ b/src/stat.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/stat.h b/src/stat.h index 851caddb6e..71c1fd4083 100644 --- a/src/stat.h +++ b/src/stat.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/stmem.cc b/src/stmem.cc index 9e1eec812e..1c8dd03bf7 100644 --- a/src/stmem.cc +++ b/src/stmem.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -60,7 +60,7 @@ mem_hdr::freeContent() { nodes.destroy(); inmem_hi = 0; - debugs(19, 9, HERE << this << " hi: " << inmem_hi); + debugs(19, 9, this << " hi: " << inmem_hi); } bool @@ -121,15 +121,15 @@ mem_hdr::writeAvailable(mem_node *aNode, int64_t location, size_t amount, char c memcpy(aNode->nodeBuffer.data + aNode->nodeBuffer.length, source, copyLen); - debugs(19, 9, HERE << this << " hi: " << inmem_hi); + debugs(19, 9, this << " hi: " << inmem_hi); if (inmem_hi <= location) inmem_hi = location + copyLen; /* Adjust the ptr and len according to what was deposited in the page */ aNode->nodeBuffer.length += copyLen; - debugs(19, 9, HERE << this << " hi: " << inmem_hi); - debugs(19, 9, HERE << this << " hi: " << endOffset()); + debugs(19, 9, this << " hi: " << inmem_hi); + debugs(19, 9, this << " hi: " << endOffset()); return copyLen; } @@ -369,7 +369,7 @@ mem_hdr::write (StoreIOBuffer const &writeBuffer) mem_hdr::mem_hdr() : inmem_hi(0) { - debugs(19, 9, HERE << this << " hi: " << inmem_hi); + debugs(19, 9, this << " hi: " << inmem_hi); } mem_hdr::~mem_hdr() diff --git a/src/stmem.h b/src/stmem.h index 92337eedc8..4cf5b9ba81 100644 --- a/src/stmem.h +++ b/src/stmem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store.cc b/src/store.cc index 5d7385f634..164e18faf4 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -311,7 +311,7 @@ StoreEntry::storeClientType() const if (mem_obj->inmem_lo == 0 && !isEmpty()) { if (swappedOut()) { - debugs(20,7, HERE << mem_obj << " lo: " << mem_obj->inmem_lo << " hi: " << mem_obj->endOffset() << " size: " << mem_obj->object_sz); + debugs(20,7, mem_obj << " lo: " << mem_obj->inmem_lo << " hi: " << mem_obj->endOffset() << " size: " << mem_obj->object_sz); if (mem_obj->endOffset() == mem_obj->object_sz) { /* hot object fully swapped in (XXX: or swapped out?) */ return STORE_MEM_CLIENT; @@ -415,7 +415,7 @@ StoreEntry::destroyMemObject() void destroyStoreEntry(void *data) { - debugs(20, 3, HERE << "destroyStoreEntry: destroying " << data); + debugs(20, 3, "destroyStoreEntry: destroying " << data); StoreEntry *e = static_cast(static_cast(data)); assert(e != NULL); diff --git a/src/store/Controlled.h b/src/store/Controlled.h index 735708c94d..7f4f7be09d 100644 --- a/src/store/Controlled.h +++ b/src/store/Controlled.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store/Controller.cc b/src/store/Controller.cc index 5dbb20f68a..56b80f05d4 100644 --- a/src/store/Controller.cc +++ b/src/store/Controller.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -453,7 +453,7 @@ Store::Controller::peek(const cache_key *key) if (sharedMemStore) { if (StoreEntry *e = sharedMemStore->get(key)) { - debugs(20, 3, HERE << "got mem-cached entry: " << *e); + debugs(20, 3, "got mem-cached entry: " << *e); return e; } } @@ -599,7 +599,7 @@ Store::Controller::memoryOut(StoreEntry &e, const bool preserveSwappable) else if (localMemStore) keepInLocalMemory = keepForLocalMemoryCache(e); - debugs(20, 7, HERE << "keepInLocalMemory: " << keepInLocalMemory); + debugs(20, 7, "keepInLocalMemory: " << keepInLocalMemory); if (!keepInLocalMemory) e.trimMemory(preserveSwappable); @@ -689,12 +689,12 @@ Store::Controller::handleIdleEntry(StoreEntry &e) // An idle, unlocked entry that only belongs to a SwapDir which controls // its own index, should not stay in the global store_table. if (!dereferenceIdle(e, keepInLocalMemory)) { - debugs(20, 5, HERE << "destroying unlocked entry: " << &e << ' ' << e); + debugs(20, 5, "destroying unlocked entry: " << &e << ' ' << e); destroyStoreEntry(static_cast(&e)); return; } - debugs(20, 5, HERE << "keepInLocalMemory: " << keepInLocalMemory); + debugs(20, 5, "keepInLocalMemory: " << keepInLocalMemory); // formerly known as "WARNING: found KEY_PRIVATE" assert(!EBIT_TEST(e.flags, KEY_PRIVATE)); diff --git a/src/store/Controller.h b/src/store/Controller.h index a74695b980..4fb4b3ff76 100644 --- a/src/store/Controller.h +++ b/src/store/Controller.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store/Disk.cc b/src/store/Disk.cc index 1fff636e58..f89c01fa16 100644 --- a/src/store/Disk.cc +++ b/src/store/Disk.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -163,7 +163,7 @@ Store::Disk::objectSizeIsAcceptable(int64_t objsize) const bool Store::Disk::canStore(const StoreEntry &e, int64_t diskSpaceNeeded, int &load) const { - debugs(47,8, HERE << "cache_dir[" << index << "]: needs " << + debugs(47,8, "cache_dir[" << index << "]: needs " << diskSpaceNeeded << " > =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store/id_rewriters/helpers.m4 b/src/store/id_rewriters/helpers.m4 index 57fd136ba0..fea459a7f8 100644 --- a/src/store/id_rewriters/helpers.m4 +++ b/src/store/id_rewriters/helpers.m4 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/src/store_client.cc b/src/store_client.cc index 38bd2e08fe..3b5856eac9 100644 --- a/src/store_client.cc +++ b/src/store_client.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -360,7 +360,7 @@ store_client::doCopy(StoreEntry *anEntry) if (!moreToSend()) { /* There is no more to send! */ - debugs(33, 3, HERE << "There is no more to send!"); + debugs(33, 3, "There is no more to send!"); callback(0); flags.store_copying = false; return; diff --git a/src/store_digest.cc b/src/store_digest.cc index abc7e1be92..d6e5a3f8b3 100644 --- a/src/store_digest.cc +++ b/src/store_digest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store_digest.h b/src/store_digest.h index 682794f96a..934b8492bf 100644 --- a/src/store_digest.h +++ b/src/store_digest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store_io.cc b/src/store_io.cc index 3986fc0309..7fcdfed7a8 100644 --- a/src/store_io.cc +++ b/src/store_io.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -65,13 +65,13 @@ void storeClose(StoreIOState::Pointer sio, int how) { if (sio->flags.closing) { - debugs(20,3,HERE << "storeClose: flags.closing already set, bailing"); + debugs(20,3, "storeClose: flags.closing already set, bailing"); return; } sio->flags.closing = true; - debugs(20,3,HERE << "storeClose: calling sio->close(" << how << ")"); + debugs(20,3, "storeClose: calling sio->close(" << how << ")"); sio->close(how); } diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc index 60440f8db4..4e33ac2ec7 100644 --- a/src/store_key_md5.cc +++ b/src/store_key_md5.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store_key_md5.h b/src/store_key_md5.h index 3e9bd42623..3bb262c84c 100644 --- a/src/store_key_md5.h +++ b/src/store_key_md5.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store_log.cc b/src/store_log.cc index f7b70d963f..2357c8abf1 100644 --- a/src/store_log.cc +++ b/src/store_log.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store_log.h b/src/store_log.h index fc0f4962c6..acd604fbee 100644 --- a/src/store_log.h +++ b/src/store_log.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc index 13da2ce0cd..c994c57a06 100644 --- a/src/store_rebuild.cc +++ b/src/store_rebuild.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -330,7 +330,7 @@ storeRebuildParseEntry(MemBuf &buf, StoreEntry &tmpe, cache_key *key, int swap_hdr_len = 0; StoreMetaUnpacker aBuilder(buf.content(), buf.contentSize(), &swap_hdr_len); if (aBuilder.isBufferZero()) { - debugs(47,5, HERE << "skipping empty record."); + debugs(47,5, "skipping empty record."); return false; } diff --git a/src/store_rebuild.h b/src/store_rebuild.h index d99d2e6fad..4a8b6eed8b 100644 --- a/src/store_rebuild.h +++ b/src/store_rebuild.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store_swapin.cc b/src/store_swapin.cc index 9e9c3c3c5b..251bc2fda1 100644 --- a/src/store_swapin.cc +++ b/src/store_swapin.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -29,7 +29,7 @@ storeSwapInStart(store_client * sc) } if (e->mem_status != NOT_IN_MEMORY) - debugs(20, 3, HERE << "already IN_MEMORY"); + debugs(20, 3, "already IN_MEMORY"); debugs(20, 3, *e << " " << e->getMD5Text()); diff --git a/src/store_swapin.h b/src/store_swapin.h index 3d2872621d..f9d4a42871 100644 --- a/src/store_swapin.h +++ b/src/store_swapin.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store_swapmeta.cc b/src/store_swapmeta.cc index 123d6d4579..8625479d78 100644 --- a/src/store_swapmeta.cc +++ b/src/store_swapmeta.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/store_swapout.cc b/src/store_swapout.cc index abb2635ba4..355f37da32 100644 --- a/src/store_swapout.cc +++ b/src/store_swapout.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -183,16 +183,16 @@ StoreEntry::swapOut() // Aborted entries have STORE_OK, but swapoutPossible rejects them. Thus, // store_status == STORE_OK below means we got everything we wanted. - debugs(20, 7, HERE << "storeSwapOut: mem->inmem_lo = " << mem_obj->inmem_lo); - debugs(20, 7, HERE << "storeSwapOut: mem->endOffset() = " << mem_obj->endOffset()); - debugs(20, 7, HERE << "storeSwapOut: swapout.queue_offset = " << mem_obj->swapout.queue_offset); + debugs(20, 7, "storeSwapOut: mem->inmem_lo = " << mem_obj->inmem_lo); + debugs(20, 7, "storeSwapOut: mem->endOffset() = " << mem_obj->endOffset()); + debugs(20, 7, "storeSwapOut: swapout.queue_offset = " << mem_obj->swapout.queue_offset); if (mem_obj->swapout.sio != NULL) debugs(20, 7, "storeSwapOut: storeOffset() = " << mem_obj->swapout.sio->offset() ); int64_t const lowest_offset = mem_obj->lowestMemReaderOffset(); - debugs(20, 7, HERE << "storeSwapOut: lowest_offset = " << lowest_offset); + debugs(20, 7, "storeSwapOut: lowest_offset = " << lowest_offset); #if SIZEOF_OFF_T <= 4 @@ -307,7 +307,7 @@ storeSwapOutFileClosed(void *data, int errflag, StoreIOState::Pointer self) debugs(20, 3, "storeSwapOutFileClosed: SwapOut complete: '" << e->url() << "' to " << e->swap_dirn << ", " << std::hex << std::setw(8) << std::setfill('0') << std::uppercase << e->swap_filen); - debugs(20, 5, HERE << "swap_file_sz = " << + debugs(20, 5, "swap_file_sz = " << e->objectLen() << " + " << mem->swap_hdr_sz); e->swap_file_sz = e->objectLen() + mem->swap_hdr_sz; @@ -347,7 +347,7 @@ StoreEntry::mayStartSwapOut() // if we decided that starting is not possible, do not repeat same checks if (decision == MemObject::SwapOut::swImpossible) { - debugs(20, 3, HERE << " already rejected"); + debugs(20, 3, " already rejected"); return false; } @@ -379,13 +379,13 @@ StoreEntry::mayStartSwapOut() } if (!checkCachable()) { - debugs(20, 3, HERE << "not cachable"); + debugs(20, 3, "not cachable"); swapOutDecision(MemObject::SwapOut::swImpossible); return false; } if (EBIT_TEST(flags, ENTRY_SPECIAL)) { - debugs(20, 3, HERE << url() << " SPECIAL"); + debugs(20, 3, url() << " SPECIAL"); swapOutDecision(MemObject::SwapOut::swImpossible); return false; } @@ -408,9 +408,9 @@ StoreEntry::mayStartSwapOut() // use guaranteed maximum if it is known const int64_t expectedEnd = mem_obj->expectedReplySize(); - debugs(20, 7, HERE << "expectedEnd = " << expectedEnd); + debugs(20, 7, "expectedEnd = " << expectedEnd); if (expectedEnd > store_maxobjsize) { - debugs(20, 3, HERE << "will not fit: " << expectedEnd << + debugs(20, 3, "will not fit: " << expectedEnd << " > " << store_maxobjsize); swapOutDecision(MemObject::SwapOut::swImpossible); return false; // known to outgrow the limit eventually @@ -419,7 +419,7 @@ StoreEntry::mayStartSwapOut() // use current minimum (always known) const int64_t currentEnd = mem_obj->endOffset(); if (currentEnd > store_maxobjsize) { - debugs(20, 3, HERE << "does not fit: " << currentEnd << + debugs(20, 3, "does not fit: " << currentEnd << " > " << store_maxobjsize); swapOutDecision(MemObject::SwapOut::swImpossible); return false; // already does not fit and may only get bigger diff --git a/src/swap_log_op.h b/src/swap_log_op.h index 6af8360469..3dd9d71930 100644 --- a/src/swap_log_op.h +++ b/src/swap_log_op.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/test_cache_digest.cc b/src/test_cache_digest.cc index d495f351ff..e2ca892cae 100644 --- a/src/test_cache_digest.cc +++ b/src/test_cache_digest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/CapturingStoreEntry.h b/src/tests/CapturingStoreEntry.h index c60624c988..1742e195dd 100644 --- a/src/tests/CapturingStoreEntry.h +++ b/src/tests/CapturingStoreEntry.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/SBufFindTest.cc b/src/tests/SBufFindTest.cc index eb523435d7..2dfc176fb6 100644 --- a/src/tests/SBufFindTest.cc +++ b/src/tests/SBufFindTest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/SBufFindTest.h b/src/tests/SBufFindTest.h index b531a2d944..0b3f78ce49 100644 --- a/src/tests/SBufFindTest.h +++ b/src/tests/SBufFindTest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/STUB.h b/src/tests/STUB.h index 9d52e2b113..55d799bb45 100644 --- a/src/tests/STUB.h +++ b/src/tests/STUB.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/Stub.am b/src/tests/Stub.am index 5124c7de59..6585cafb64 100644 --- a/src/tests/Stub.am +++ b/src/tests/Stub.am @@ -1,5 +1,5 @@ ## -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. @@ -30,6 +30,7 @@ STUB_SOURCE = \ tests/stub_external_acl.cc \ tests/stub_fatal.cc \ tests/stub_fd.cc \ + tests/stub_fqdncache.cc \ tests/stub_gopher.cc \ tests/stub_helper.cc \ tests/stub_HelperChildConfig.cc \ diff --git a/src/tests/TestSwapDir.cc b/src/tests/TestSwapDir.cc index 43ad158631..200c058206 100644 --- a/src/tests/TestSwapDir.cc +++ b/src/tests/TestSwapDir.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/TestSwapDir.h b/src/tests/TestSwapDir.h index 177218686b..ee85802fc2 100644 --- a/src/tests/TestSwapDir.h +++ b/src/tests/TestSwapDir.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_CacheDigest.cc b/src/tests/stub_CacheDigest.cc index eaefbdd682..1d9f373a77 100644 --- a/src/tests/stub_CacheDigest.cc +++ b/src/tests/stub_CacheDigest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_CachePeer.cc b/src/tests/stub_CachePeer.cc index fa2366109b..abb4ae2ec1 100644 --- a/src/tests/stub_CachePeer.cc +++ b/src/tests/stub_CachePeer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_CollapsedForwarding.cc b/src/tests/stub_CollapsedForwarding.cc index 1230d38d01..7f58c53ab9 100644 --- a/src/tests/stub_CollapsedForwarding.cc +++ b/src/tests/stub_CollapsedForwarding.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_CommIO.cc b/src/tests/stub_CommIO.cc index 9140c9e8e7..7a93df2cce 100644 --- a/src/tests/stub_CommIO.cc +++ b/src/tests/stub_CommIO.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_DelayId.cc b/src/tests/stub_DelayId.cc index 799b8dd252..23942a09bb 100644 --- a/src/tests/stub_DelayId.cc +++ b/src/tests/stub_DelayId.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_ETag.cc b/src/tests/stub_ETag.cc index 035b29cc4e..d74141e071 100644 --- a/src/tests/stub_ETag.cc +++ b/src/tests/stub_ETag.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_EventLoop.cc b/src/tests/stub_EventLoop.cc index fdef57fb82..2d61d11078 100644 --- a/src/tests/stub_EventLoop.cc +++ b/src/tests/stub_EventLoop.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_HelperChildConfig.cc b/src/tests/stub_HelperChildConfig.cc index 5b282df849..636ebbf495 100644 --- a/src/tests/stub_HelperChildConfig.cc +++ b/src/tests/stub_HelperChildConfig.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_HttpControlMsg.cc b/src/tests/stub_HttpControlMsg.cc index 906ca06cb9..fae702d411 100644 --- a/src/tests/stub_HttpControlMsg.cc +++ b/src/tests/stub_HttpControlMsg.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_HttpHeader.cc b/src/tests/stub_HttpHeader.cc index 7b58589de5..3111855696 100644 --- a/src/tests/stub_HttpHeader.cc +++ b/src/tests/stub_HttpHeader.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_HttpReply.cc b/src/tests/stub_HttpReply.cc index 005449d6d7..184d66e81e 100644 --- a/src/tests/stub_HttpReply.cc +++ b/src/tests/stub_HttpReply.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_HttpRequest.cc b/src/tests/stub_HttpRequest.cc index c271ad10d1..3fdbcca571 100644 --- a/src/tests/stub_HttpRequest.cc +++ b/src/tests/stub_HttpRequest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_HttpUpgradeProtocolAccess.cc b/src/tests/stub_HttpUpgradeProtocolAccess.cc index f1278ca6e8..ee795525f2 100644 --- a/src/tests/stub_HttpUpgradeProtocolAccess.cc +++ b/src/tests/stub_HttpUpgradeProtocolAccess.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_IpcIoFile.cc b/src/tests/stub_IpcIoFile.cc index 161991a32f..6d94beee9e 100644 --- a/src/tests/stub_IpcIoFile.cc +++ b/src/tests/stub_IpcIoFile.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_MemBuf.cc b/src/tests/stub_MemBuf.cc index 590c8d81a5..bfab579c29 100644 --- a/src/tests/stub_MemBuf.cc +++ b/src/tests/stub_MemBuf.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_MemObject.cc b/src/tests/stub_MemObject.cc index 099b8be870..e9dce01ce1 100644 --- a/src/tests/stub_MemObject.cc +++ b/src/tests/stub_MemObject.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_MemStore.cc b/src/tests/stub_MemStore.cc index f0692bfef7..ff4e08dc76 100644 --- a/src/tests/stub_MemStore.cc +++ b/src/tests/stub_MemStore.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_Port.cc b/src/tests/stub_Port.cc index 21a9f0ae9b..abb4ddd7b1 100644 --- a/src/tests/stub_Port.cc +++ b/src/tests/stub_Port.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_SBuf.cc b/src/tests/stub_SBuf.cc index bb0eb4b960..f0d30a7570 100644 --- a/src/tests/stub_SBuf.cc +++ b/src/tests/stub_SBuf.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_SBufDetailedStats.cc b/src/tests/stub_SBufDetailedStats.cc index c9baed93cc..42080c9a21 100644 --- a/src/tests/stub_SBufDetailedStats.cc +++ b/src/tests/stub_SBufDetailedStats.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_StatHist.cc b/src/tests/stub_StatHist.cc index e37899488d..a4dceca76f 100644 --- a/src/tests/stub_StatHist.cc +++ b/src/tests/stub_StatHist.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -18,7 +18,7 @@ void StatHist::dump(StoreEntry *, StatHistBinDumper *) const STUB void StatHist::enumInit(unsigned int) STUB_NOP void StatHist::count(double) {/* STUB_NOP */} double statHistDeltaMedian(const StatHist &, const StatHist &) STUB_RETVAL(0.0) -double statHistDeltaPctile(const StatHist & , const StatHist & , double) STUB_RETVAL(0.0) +double statHistDeltaPctile(const StatHist &, const StatHist &, double) STUB_RETVAL(0.0) void StatHist::logInit(unsigned int, double, double) STUB_NOP void statHistIntDumper(StoreEntry *, int, double, double, int) STUB diff --git a/src/tests/stub_StoreMeta.cc b/src/tests/stub_StoreMeta.cc index 1eb0f9370d..588d34ff64 100644 --- a/src/tests/stub_StoreMeta.cc +++ b/src/tests/stub_StoreMeta.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_UdsOp.cc b/src/tests/stub_UdsOp.cc index 8aa82deb72..0af415f242 100644 --- a/src/tests/stub_UdsOp.cc +++ b/src/tests/stub_UdsOp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_access_log.cc b/src/tests/stub_access_log.cc index dd01fa454b..c27b0d00dc 100644 --- a/src/tests/stub_access_log.cc +++ b/src/tests/stub_access_log.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_acl.cc b/src/tests/stub_acl.cc index 12d5bb70a5..cf942a7923 100644 --- a/src/tests/stub_acl.cc +++ b/src/tests/stub_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_cache_cf.cc b/src/tests/stub_cache_cf.cc index af38cb8c5f..d21df483f9 100644 --- a/src/tests/stub_cache_cf.cc +++ b/src/tests/stub_cache_cf.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_cache_manager.cc b/src/tests/stub_cache_manager.cc index e112faa29f..2fab12a18c 100644 --- a/src/tests/stub_cache_manager.cc +++ b/src/tests/stub_cache_manager.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_carp.cc b/src/tests/stub_carp.cc index 3f1a9d7717..2ee78c8555 100644 --- a/src/tests/stub_carp.cc +++ b/src/tests/stub_carp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_cbdata.cc b/src/tests/stub_cbdata.cc index 538f56cefd..3f8169b981 100644 --- a/src/tests/stub_cbdata.cc +++ b/src/tests/stub_cbdata.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_client_db.cc b/src/tests/stub_client_db.cc index bf979d8627..a67df93c3b 100644 --- a/src/tests/stub_client_db.cc +++ b/src/tests/stub_client_db.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_client_side.cc b/src/tests/stub_client_side.cc index 4cc9abdc28..58e68f7658 100644 --- a/src/tests/stub_client_side.cc +++ b/src/tests/stub_client_side.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_client_side_request.cc b/src/tests/stub_client_side_request.cc index 6c8ea24e14..c1e439ceda 100644 --- a/src/tests/stub_client_side_request.cc +++ b/src/tests/stub_client_side_request.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_comm.cc b/src/tests/stub_comm.cc index 607e4e8819..f86e93356e 100644 --- a/src/tests/stub_comm.cc +++ b/src/tests/stub_comm.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_debug.cc b/src/tests/stub_debug.cc index 3ce8119ce6..73c043cb3a 100644 --- a/src/tests/stub_debug.cc +++ b/src/tests/stub_debug.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_errorpage.cc b/src/tests/stub_errorpage.cc index 55e5d1f277..ba92c8b7c8 100644 --- a/src/tests/stub_errorpage.cc +++ b/src/tests/stub_errorpage.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_event.cc b/src/tests/stub_event.cc index 2c64338866..de28e75b96 100644 --- a/src/tests/stub_event.cc +++ b/src/tests/stub_event.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_external_acl.cc b/src/tests/stub_external_acl.cc index 7b786ab88e..6d562dfd30 100644 --- a/src/tests/stub_external_acl.cc +++ b/src/tests/stub_external_acl.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_fatal.cc b/src/tests/stub_fatal.cc index 12ad932fc9..8b5a34479c 100644 --- a/src/tests/stub_fatal.cc +++ b/src/tests/stub_fatal.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_fd.cc b/src/tests/stub_fd.cc index 15b7457ca5..e6361eb0eb 100644 --- a/src/tests/stub_fd.cc +++ b/src/tests/stub_fd.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_fqdncache.cc b/src/tests/stub_fqdncache.cc index e77014c446..3bc612fbeb 100644 --- a/src/tests/stub_fqdncache.cc +++ b/src/tests/stub_fqdncache.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_gopher.cc b/src/tests/stub_gopher.cc index 4e5db53160..2dc56b9b38 100644 --- a/src/tests/stub_gopher.cc +++ b/src/tests/stub_gopher.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_helper.cc b/src/tests/stub_helper.cc index 7e25327f89..21920be1ee 100644 --- a/src/tests/stub_helper.cc +++ b/src/tests/stub_helper.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_http.cc b/src/tests/stub_http.cc index 575d5eaa44..26b02c902b 100644 --- a/src/tests/stub_http.cc +++ b/src/tests/stub_http.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_icp.cc b/src/tests/stub_icp.cc index 3baa31e438..3437705f7a 100644 --- a/src/tests/stub_icp.cc +++ b/src/tests/stub_icp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_internal.cc b/src/tests/stub_internal.cc index 0a1c5a8131..7068357b60 100644 --- a/src/tests/stub_internal.cc +++ b/src/tests/stub_internal.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_ipc.cc b/src/tests/stub_ipc.cc index 0b5bccefc1..39ab1ebbf4 100644 --- a/src/tests/stub_ipc.cc +++ b/src/tests/stub_ipc.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_ipc_Forwarder.cc b/src/tests/stub_ipc_Forwarder.cc index f25e082eee..a0dc053ea0 100644 --- a/src/tests/stub_ipc_Forwarder.cc +++ b/src/tests/stub_ipc_Forwarder.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_ipc_TypedMsgHdr.cc b/src/tests/stub_ipc_TypedMsgHdr.cc index 3c7ddd6fc5..285cffa92b 100644 --- a/src/tests/stub_ipc_TypedMsgHdr.cc +++ b/src/tests/stub_ipc_TypedMsgHdr.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_ipcache.cc b/src/tests/stub_ipcache.cc index cbc9dfa8b0..81a8e09295 100644 --- a/src/tests/stub_ipcache.cc +++ b/src/tests/stub_ipcache.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libanyp.cc b/src/tests/stub_libanyp.cc index b798f6a259..db6b138cce 100644 --- a/src/tests/stub_libanyp.cc +++ b/src/tests/stub_libanyp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libauth.cc b/src/tests/stub_libauth.cc index 3d98c32fc6..9985b61a01 100644 --- a/src/tests/stub_libauth.cc +++ b/src/tests/stub_libauth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libauth_acls.cc b/src/tests/stub_libauth_acls.cc index d9d3b061d8..6459dd2de8 100644 --- a/src/tests/stub_libauth_acls.cc +++ b/src/tests/stub_libauth_acls.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libcomm.cc b/src/tests/stub_libcomm.cc index 555cb77d79..cdfaa471e1 100644 --- a/src/tests/stub_libcomm.cc +++ b/src/tests/stub_libcomm.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libdiskio.cc b/src/tests/stub_libdiskio.cc index b4250c3aef..55042acc04 100644 --- a/src/tests/stub_libdiskio.cc +++ b/src/tests/stub_libdiskio.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libeui.cc b/src/tests/stub_libeui.cc index c028dfafab..669b2457a2 100644 --- a/src/tests/stub_libeui.cc +++ b/src/tests/stub_libeui.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libformat.cc b/src/tests/stub_libformat.cc index 50c20ea597..cdc61923ad 100644 --- a/src/tests/stub_libformat.cc +++ b/src/tests/stub_libformat.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libhttp.cc b/src/tests/stub_libhttp.cc index 5feb3729b8..0419ffe318 100644 --- a/src/tests/stub_libhttp.cc +++ b/src/tests/stub_libhttp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libicmp.cc b/src/tests/stub_libicmp.cc index efabcfbdc0..658fe8af6f 100644 --- a/src/tests/stub_libicmp.cc +++ b/src/tests/stub_libicmp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libip.cc b/src/tests/stub_libip.cc index fe24d113df..32b0d3aa67 100644 --- a/src/tests/stub_libip.cc +++ b/src/tests/stub_libip.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_liblog.cc b/src/tests/stub_liblog.cc index 25f4a4bbaa..acfd117ec9 100644 --- a/src/tests/stub_liblog.cc +++ b/src/tests/stub_liblog.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libmem.cc b/src/tests/stub_libmem.cc index d8aeac088c..f5f94c99b8 100644 --- a/src/tests/stub_libmem.cc +++ b/src/tests/stub_libmem.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libmgr.cc b/src/tests/stub_libmgr.cc index cb2f292cda..56eb1d725b 100644 --- a/src/tests/stub_libmgr.cc +++ b/src/tests/stub_libmgr.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libsecurity.cc b/src/tests/stub_libsecurity.cc index 79bd8c71b2..b0a1ae109b 100644 --- a/src/tests/stub_libsecurity.cc +++ b/src/tests/stub_libsecurity.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libsslsquid.cc b/src/tests/stub_libsslsquid.cc index 4a51d46bff..5197d04184 100644 --- a/src/tests/stub_libsslsquid.cc +++ b/src/tests/stub_libsslsquid.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_libstore.cc b/src/tests/stub_libstore.cc index 48b11d3870..75a2318888 100644 --- a/src/tests/stub_libstore.cc +++ b/src/tests/stub_libstore.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_main_cc.cc b/src/tests/stub_main_cc.cc index 743f942285..107aac96b6 100644 --- a/src/tests/stub_main_cc.cc +++ b/src/tests/stub_main_cc.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_mem_node.cc b/src/tests/stub_mem_node.cc index 395e52fd86..e9df260122 100644 --- a/src/tests/stub_mem_node.cc +++ b/src/tests/stub_mem_node.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_mime.cc b/src/tests/stub_mime.cc index fd340dd718..e97e5c8d67 100644 --- a/src/tests/stub_mime.cc +++ b/src/tests/stub_mime.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_neighbors.cc b/src/tests/stub_neighbors.cc index c7fddee9d8..f6efc00148 100644 --- a/src/tests/stub_neighbors.cc +++ b/src/tests/stub_neighbors.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_pconn.cc b/src/tests/stub_pconn.cc index 81fd81739b..8c04caf8c3 100644 --- a/src/tests/stub_pconn.cc +++ b/src/tests/stub_pconn.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_redirect.cc b/src/tests/stub_redirect.cc index 366a4e4bbb..3c51c793cf 100644 --- a/src/tests/stub_redirect.cc +++ b/src/tests/stub_redirect.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_stat.cc b/src/tests/stub_stat.cc index 3fa5f4290f..44b1a9b2a5 100644 --- a/src/tests/stub_stat.cc +++ b/src/tests/stub_stat.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_stmem.cc b/src/tests/stub_stmem.cc index 5c2f667659..89457791cb 100644 --- a/src/tests/stub_stmem.cc +++ b/src/tests/stub_stmem.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_store.cc b/src/tests/stub_store.cc index 564628733e..2bf80f1ece 100644 --- a/src/tests/stub_store.cc +++ b/src/tests/stub_store.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_store_client.cc b/src/tests/stub_store_client.cc index a56891d486..9d0e2b8001 100644 --- a/src/tests/stub_store_client.cc +++ b/src/tests/stub_store_client.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -8,10 +8,10 @@ #include "squid.h" #include "repl_modules.h" +#include "Store.h" #include "store_digest.h" #include "store_log.h" #include "store_rebuild.h" -#include "Store.h" #include "StoreClient.h" #define STUB_API "store_client.cc" diff --git a/src/tests/stub_store_digest.cc b/src/tests/stub_store_digest.cc index e4628895bc..83852e8fe5 100644 --- a/src/tests/stub_store_digest.cc +++ b/src/tests/stub_store_digest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_store_rebuild.cc b/src/tests/stub_store_rebuild.cc index 71a51196bb..231c2694b3 100644 --- a/src/tests/stub_store_rebuild.cc +++ b/src/tests/stub_store_rebuild.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_store_stats.cc b/src/tests/stub_store_stats.cc index 6cd50ac91d..cfd9cbe7a4 100644 --- a/src/tests/stub_store_stats.cc +++ b/src/tests/stub_store_stats.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_store_swapout.cc b/src/tests/stub_store_swapout.cc index 3b8a42116e..b45b82809e 100644 --- a/src/tests/stub_store_swapout.cc +++ b/src/tests/stub_store_swapout.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_time.cc b/src/tests/stub_time.cc index 089ca57f88..ae2ee9d25f 100644 --- a/src/tests/stub_time.cc +++ b/src/tests/stub_time.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_tools.cc b/src/tests/stub_tools.cc index 36b7a2a7ed..0b4707b83f 100644 --- a/src/tests/stub_tools.cc +++ b/src/tests/stub_tools.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_tunnel.cc b/src/tests/stub_tunnel.cc index 53a1ac9ac7..4509fe2570 100644 --- a/src/tests/stub_tunnel.cc +++ b/src/tests/stub_tunnel.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_wccp2.cc b/src/tests/stub_wccp2.cc index 6bc571d457..40beb7dbdf 100644 --- a/src/tests/stub_wccp2.cc +++ b/src/tests/stub_wccp2.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_whois.cc b/src/tests/stub_whois.cc index 91f1d7fbf9..c0318518d5 100644 --- a/src/tests/stub_whois.cc +++ b/src/tests/stub_whois.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/stub_wordlist.cc b/src/tests/stub_wordlist.cc index 3ac8596b2d..451334f7fe 100644 --- a/src/tests/stub_wordlist.cc +++ b/src/tests/stub_wordlist.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc index 7adcbf8500..b86b21b516 100644 --- a/src/tests/testACLMaxUserIP.cc +++ b/src/tests/testACLMaxUserIP.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testACLMaxUserIP.h b/src/tests/testACLMaxUserIP.h index 118c3e3212..3edb09a791 100644 --- a/src/tests/testACLMaxUserIP.h +++ b/src/tests/testACLMaxUserIP.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc index 747df6037d..6e556dc3d2 100644 --- a/src/tests/testAuth.cc +++ b/src/tests/testAuth.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testAuth.h b/src/tests/testAuth.h index 0fa5eb9966..440e28a4f1 100644 --- a/src/tests/testAuth.h +++ b/src/tests/testAuth.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testBoilerplate.cc b/src/tests/testBoilerplate.cc index 6e20ecbbbb..6f19d98cf9 100644 --- a/src/tests/testBoilerplate.cc +++ b/src/tests/testBoilerplate.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testBoilerplate.h b/src/tests/testBoilerplate.h index d5931d3f33..b238b01fe0 100644 --- a/src/tests/testBoilerplate.h +++ b/src/tests/testBoilerplate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testCacheManager.cc b/src/tests/testCacheManager.cc index 2378278eb8..d6f06a5540 100644 --- a/src/tests/testCacheManager.cc +++ b/src/tests/testCacheManager.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testCacheManager.h b/src/tests/testCacheManager.h index 4aa22fbf47..e9cbf6cd10 100644 --- a/src/tests/testCacheManager.h +++ b/src/tests/testCacheManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testCharacterSet.cc b/src/tests/testCharacterSet.cc index 476d879839..92fd56eb11 100644 --- a/src/tests/testCharacterSet.cc +++ b/src/tests/testCharacterSet.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testCharacterSet.h b/src/tests/testCharacterSet.h index 290c54b6c6..9e3e61d9a0 100644 --- a/src/tests/testCharacterSet.h +++ b/src/tests/testCharacterSet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testConfigParser.cc b/src/tests/testConfigParser.cc index fa1960afd2..86b0fc8c5a 100644 --- a/src/tests/testConfigParser.cc +++ b/src/tests/testConfigParser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testConfigParser.h b/src/tests/testConfigParser.h index ccee9eeba9..e61b536a87 100644 --- a/src/tests/testConfigParser.h +++ b/src/tests/testConfigParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc index 4ca6179e87..c0cafa4729 100644 --- a/src/tests/testDiskIO.cc +++ b/src/tests/testDiskIO.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testDiskIO.h b/src/tests/testDiskIO.h index d081e4451f..9e8b26bd77 100644 --- a/src/tests/testDiskIO.h +++ b/src/tests/testDiskIO.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testEnumIterator.cc b/src/tests/testEnumIterator.cc index 7bddb9f51f..242deea05e 100644 --- a/src/tests/testEnumIterator.cc +++ b/src/tests/testEnumIterator.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testEnumIterator.h b/src/tests/testEnumIterator.h index ce29b1f7d4..c60cd7e25e 100644 --- a/src/tests/testEnumIterator.h +++ b/src/tests/testEnumIterator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testEvent.cc b/src/tests/testEvent.cc index 2028c28962..c24a642273 100644 --- a/src/tests/testEvent.cc +++ b/src/tests/testEvent.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testEvent.h b/src/tests/testEvent.h index cce631b129..bdff2598eb 100644 --- a/src/tests/testEvent.h +++ b/src/tests/testEvent.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc index 1dc0421201..a18174797d 100644 --- a/src/tests/testEventLoop.cc +++ b/src/tests/testEventLoop.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testEventLoop.h b/src/tests/testEventLoop.h index 9d4b14b087..82e494017a 100644 --- a/src/tests/testEventLoop.h +++ b/src/tests/testEventLoop.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testHttp1Parser.cc b/src/tests/testHttp1Parser.cc index 3105b0b1b1..aba57e5408 100644 --- a/src/tests/testHttp1Parser.cc +++ b/src/tests/testHttp1Parser.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testHttp1Parser.h b/src/tests/testHttp1Parser.h index 8c2caa9140..e65a9c53f7 100644 --- a/src/tests/testHttp1Parser.h +++ b/src/tests/testHttp1Parser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc index 89724ddb82..ee21b8467c 100644 --- a/src/tests/testHttpReply.cc +++ b/src/tests/testHttpReply.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testHttpReply.h b/src/tests/testHttpReply.h index f416a65af0..a07abf4a7d 100644 --- a/src/tests/testHttpReply.h +++ b/src/tests/testHttpReply.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc index e79e0d99da..047296858c 100644 --- a/src/tests/testHttpRequest.cc +++ b/src/tests/testHttpRequest.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testHttpRequest.h b/src/tests/testHttpRequest.h index 16daf15e90..63140a7de8 100644 --- a/src/tests/testHttpRequest.h +++ b/src/tests/testHttpRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc index 13f24e38b4..22c7b2bc1e 100644 --- a/src/tests/testHttpRequestMethod.cc +++ b/src/tests/testHttpRequestMethod.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testHttpRequestMethod.h b/src/tests/testHttpRequestMethod.h index 7403502fb4..0eda16eb8a 100644 --- a/src/tests/testHttpRequestMethod.h +++ b/src/tests/testHttpRequestMethod.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testIcmp.cc b/src/tests/testIcmp.cc index af778e18c0..0cce5cd7e3 100644 --- a/src/tests/testIcmp.cc +++ b/src/tests/testIcmp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testIcmp.h b/src/tests/testIcmp.h index 83c25f6d45..1684c77717 100644 --- a/src/tests/testIcmp.h +++ b/src/tests/testIcmp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testIpAddress.cc b/src/tests/testIpAddress.cc index edcd9fd27f..695d97f3b2 100644 --- a/src/tests/testIpAddress.cc +++ b/src/tests/testIpAddress.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testIpAddress.h b/src/tests/testIpAddress.h index b5c823f343..cbc500e076 100644 --- a/src/tests/testIpAddress.h +++ b/src/tests/testIpAddress.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testLookupTable.cc b/src/tests/testLookupTable.cc index 7b7fce773e..c2ce1c31b5 100644 --- a/src/tests/testLookupTable.cc +++ b/src/tests/testLookupTable.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testLookupTable.h b/src/tests/testLookupTable.h index 4feceb6fb0..ac2b1f20dc 100644 --- a/src/tests/testLookupTable.h +++ b/src/tests/testLookupTable.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testMem.cc b/src/tests/testMem.cc index 8e96e91124..db74a2c989 100644 --- a/src/tests/testMem.cc +++ b/src/tests/testMem.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testMem.h b/src/tests/testMem.h index 504bdb6d0e..846d5d2b49 100644 --- a/src/tests/testMem.h +++ b/src/tests/testMem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testNetDb.cc b/src/tests/testNetDb.cc index 0c81617b23..7e75d5d089 100644 --- a/src/tests/testNetDb.cc +++ b/src/tests/testNetDb.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testNetDb.h b/src/tests/testNetDb.h index 8d09f10e26..c990088218 100644 --- a/src/tests/testNetDb.h +++ b/src/tests/testNetDb.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testPackableStream.cc b/src/tests/testPackableStream.cc index 4cb337f4b2..b4abea29d1 100644 --- a/src/tests/testPackableStream.cc +++ b/src/tests/testPackableStream.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testPackableStream.h b/src/tests/testPackableStream.h index 3be80eb315..d73ae6126f 100644 --- a/src/tests/testPackableStream.h +++ b/src/tests/testPackableStream.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testRFC1035.cc b/src/tests/testRFC1035.cc index 48ea40fee1..c00138ba1b 100644 --- a/src/tests/testRFC1035.cc +++ b/src/tests/testRFC1035.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testRFC1035.h b/src/tests/testRFC1035.h index 3ff3b4c22d..d7904de300 100644 --- a/src/tests/testRFC1035.h +++ b/src/tests/testRFC1035.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testRefCount.cc b/src/tests/testRefCount.cc index f99440a928..ccff873a9e 100644 --- a/src/tests/testRefCount.cc +++ b/src/tests/testRefCount.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testRefCount.h b/src/tests/testRefCount.h index 66fcbd929a..609a63a5f3 100644 --- a/src/tests/testRefCount.h +++ b/src/tests/testRefCount.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc index 55d5ed0e08..cc82f3a4b8 100644 --- a/src/tests/testRock.cc +++ b/src/tests/testRock.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testRock.h b/src/tests/testRock.h index 160e85a8cf..6c39acfd5d 100644 --- a/src/tests/testRock.h +++ b/src/tests/testRock.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc index fa758b2f73..c5cd4486f2 100644 --- a/src/tests/testSBuf.cc +++ b/src/tests/testSBuf.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testSBuf.h b/src/tests/testSBuf.h index 914aee36da..df79693483 100644 --- a/src/tests/testSBuf.h +++ b/src/tests/testSBuf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testSBufList.cc b/src/tests/testSBufList.cc index 28ba88ef8e..a14c04b223 100644 --- a/src/tests/testSBufList.cc +++ b/src/tests/testSBufList.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testSBufList.h b/src/tests/testSBufList.h index 0c5e731fd6..16721b588d 100644 --- a/src/tests/testSBufList.h +++ b/src/tests/testSBufList.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStatHist.cc b/src/tests/testStatHist.cc index 7d8076a172..d76c430e0f 100644 --- a/src/tests/testStatHist.cc +++ b/src/tests/testStatHist.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStatHist.h b/src/tests/testStatHist.h index 1a314cda7f..f5982d00ab 100644 --- a/src/tests/testStatHist.h +++ b/src/tests/testStatHist.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc index 8a5fd398d6..343e546210 100644 --- a/src/tests/testStore.cc +++ b/src/tests/testStore.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStore.h b/src/tests/testStore.h index 87261060ba..8d76154987 100644 --- a/src/tests/testStore.h +++ b/src/tests/testStore.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStoreController.cc b/src/tests/testStoreController.cc index a8c3c01226..a4e3619be3 100644 --- a/src/tests/testStoreController.cc +++ b/src/tests/testStoreController.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStoreController.h b/src/tests/testStoreController.h index 415d423e90..f9758b3fd6 100644 --- a/src/tests/testStoreController.h +++ b/src/tests/testStoreController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc index 595ad784f8..c9e48c84d1 100644 --- a/src/tests/testStoreHashIndex.cc +++ b/src/tests/testStoreHashIndex.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStoreHashIndex.h b/src/tests/testStoreHashIndex.h index ff46881c77..ccd828814c 100644 --- a/src/tests/testStoreHashIndex.h +++ b/src/tests/testStoreHashIndex.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStoreSupport.cc b/src/tests/testStoreSupport.cc index 6211d52baf..d4118726f2 100644 --- a/src/tests/testStoreSupport.cc +++ b/src/tests/testStoreSupport.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testStoreSupport.h b/src/tests/testStoreSupport.h index 8f9d3765f9..68491dcc52 100644 --- a/src/tests/testStoreSupport.h +++ b/src/tests/testStoreSupport.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testString.cc b/src/tests/testString.cc index cdcafa9ec4..afabc7898f 100644 --- a/src/tests/testString.cc +++ b/src/tests/testString.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testString.h b/src/tests/testString.h index fb1626a3d7..9786bd08fe 100644 --- a/src/tests/testString.h +++ b/src/tests/testString.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testTokenizer.cc b/src/tests/testTokenizer.cc index a80fa59e34..b478886709 100644 --- a/src/tests/testTokenizer.cc +++ b/src/tests/testTokenizer.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testTokenizer.h b/src/tests/testTokenizer.h index 70c39057b5..abafb190f0 100644 --- a/src/tests/testTokenizer.h +++ b/src/tests/testTokenizer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testURL.cc b/src/tests/testURL.cc index d77e1f00ac..6589b5f219 100644 --- a/src/tests/testURL.cc +++ b/src/tests/testURL.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testURL.h b/src/tests/testURL.h index 4c7ac24a23..1e1d25370a 100644 --- a/src/tests/testURL.h +++ b/src/tests/testURL.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc index 77423847f0..ef61559878 100644 --- a/src/tests/testUfs.cc +++ b/src/tests/testUfs.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testUfs.h b/src/tests/testUfs.h index 5162f037bf..db848c3392 100644 --- a/src/tests/testUfs.h +++ b/src/tests/testUfs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testUriScheme.cc b/src/tests/testUriScheme.cc index fe66329f9c..cb2464b3df 100644 --- a/src/tests/testUriScheme.cc +++ b/src/tests/testUriScheme.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testUriScheme.h b/src/tests/testUriScheme.h index 35e124100b..810258785f 100644 --- a/src/tests/testUriScheme.h +++ b/src/tests/testUriScheme.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testYesNoNone.cc b/src/tests/testYesNoNone.cc index 762c57e4e1..8c2b499155 100644 --- a/src/tests/testYesNoNone.cc +++ b/src/tests/testYesNoNone.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/testYesNoNone.h b/src/tests/testYesNoNone.h index 232213a461..fed6b92fd2 100644 --- a/src/tests/testYesNoNone.h +++ b/src/tests/testYesNoNone.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tests/test_http_range.cc b/src/tests/test_http_range.cc index a90f7b535e..ca16f9b6be 100644 --- a/src/tests/test_http_range.cc +++ b/src/tests/test_http_range.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/time.cc b/src/time.cc index 57ad559e42..5fd1236588 100644 --- a/src/time.cc +++ b/src/time.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tools.cc b/src/tools.cc index 878b09b38c..0d3f6a5ffc 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -493,7 +493,7 @@ getMyHostname(void) const char * uniqueHostname(void) { - debugs(21, 3, HERE << " Config: '" << Config.uniqueHostname << "'"); + debugs(21, 3, " Config: '" << Config.uniqueHostname << "'"); return Config.uniqueHostname ? Config.uniqueHostname : getMyHostname(); } diff --git a/src/tools.h b/src/tools.h index 0414d71664..35e2fe3223 100644 --- a/src/tools.h +++ b/src/tools.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/tunnel.cc b/src/tunnel.cc index 78f408ded0..82529a726f 100644 --- a/src/tunnel.cc +++ b/src/tunnel.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -474,7 +474,7 @@ TunnelStateData::Connection::bytesWanted(int lowerbound, int upperbound) const void TunnelStateData::Connection::bytesIn(int const &count) { - debugs(26, 3, HERE << "len=" << len << " + count=" << count); + debugs(26, 3, "len=" << len << " + count=" << count); #if USE_DELAY_POOLS delayId.bytesIn(count); #endif @@ -513,7 +513,7 @@ TunnelStateData::ReadServer(const Comm::ConnectionPointer &c, char *buf, size_t { TunnelStateData *tunnelState = (TunnelStateData *)data; assert(cbdataReferenceValid(tunnelState)); - debugs(26, 3, HERE << c); + debugs(26, 3, c); tunnelState->readServer(buf, len, errcode, xerrno); } @@ -521,7 +521,7 @@ TunnelStateData::ReadServer(const Comm::ConnectionPointer &c, char *buf, size_t void TunnelStateData::readServer(char *, size_t len, Comm::Flag errcode, int xerrno) { - debugs(26, 3, HERE << server.conn << ", read " << len << " bytes, err=" << errcode); + debugs(26, 3, server.conn << ", read " << len << " bytes, err=" << errcode); server.delayedLoops=0; /* @@ -546,7 +546,7 @@ TunnelStateData::readServer(char *, size_t len, Comm::Flag errcode, int xerrno) void TunnelStateData::Connection::error(int const xerrno) { - debugs(50, debugLevelForError(xerrno), HERE << conn << ": read/write failure: " << xstrerr(xerrno)); + debugs(50, debugLevelForError(xerrno), conn << ": read/write failure: " << xstrerr(xerrno)); if (!ignoreErrno(xerrno)) conn->close(); @@ -565,7 +565,7 @@ TunnelStateData::ReadClient(const Comm::ConnectionPointer &, char *buf, size_t l void TunnelStateData::readClient(char *, size_t len, Comm::Flag errcode, int xerrno) { - debugs(26, 3, HERE << client.conn << ", read " << len << " bytes, err=" << errcode); + debugs(26, 3, client.conn << ", read " << len << " bytes, err=" << errcode); client.delayedLoops=0; /* @@ -590,7 +590,7 @@ TunnelStateData::readClient(char *, size_t len, Comm::Flag errcode, int xerrno) bool TunnelStateData::keepGoingAfterRead(size_t len, Comm::Flag errcode, int xerrno, Connection &from, Connection &to) { - debugs(26, 3, HERE << "from={" << from.conn << "}, to={" << to.conn << "}"); + debugs(26, 3, "from={" << from.conn << "}, to={" << to.conn << "}"); /* I think this is to prevent free-while-in-a-callback behaviour * - RBC 20030229 @@ -616,7 +616,7 @@ TunnelStateData::keepGoingAfterRead(size_t len, Comm::Flag errcode, int xerrno, if (errcode) from.error (xerrno); else if (len == 0 || !Comm::IsConnOpen(to.conn)) { - debugs(26, 3, HERE << "Nothing to write or client gone. Terminate the tunnel."); + debugs(26, 3, "Nothing to write or client gone. Terminate the tunnel."); from.conn->close(); /* Only close the remote end if we've finished queueing data to it */ @@ -633,7 +633,7 @@ TunnelStateData::keepGoingAfterRead(size_t len, Comm::Flag errcode, int xerrno, void TunnelStateData::copy(size_t len, Connection &from, Connection &to, IOCB *completion) { - debugs(26, 3, HERE << "Schedule Write"); + debugs(26, 3, "Schedule Write"); AsyncCall::Pointer call = commCbCall(5,5, "TunnelBlindCopyWriteHandler", CommIoCbPtrFun(completion, this)); to.write(from.buf, len, call, NULL); @@ -653,7 +653,7 @@ TunnelStateData::WriteServerDone(const Comm::ConnectionPointer &, char *buf, siz void TunnelStateData::writeServerDone(char *, size_t len, Comm::Flag flag, int xerrno) { - debugs(26, 3, HERE << server.conn << ", " << len << " bytes written, flag=" << flag); + debugs(26, 3, server.conn << ", " << len << " bytes written, flag=" << flag); if (flag == Comm::ERR_CLOSING) return; @@ -669,7 +669,7 @@ TunnelStateData::writeServerDone(char *, size_t len, Comm::Flag flag, int xerrno /* EOF? */ if (len == 0) { - debugs(26, 4, HERE << "No read input. Closing server connection."); + debugs(26, 4, "No read input. Closing server connection."); server.conn->close(); return; } @@ -681,7 +681,7 @@ TunnelStateData::writeServerDone(char *, size_t len, Comm::Flag flag, int xerrno /* If the other end has closed, so should we */ if (!Comm::IsConnOpen(client.conn)) { - debugs(26, 4, HERE << "Client gone away. Shutting down server connection."); + debugs(26, 4, "Client gone away. Shutting down server connection."); server.conn->close(); return; } @@ -706,7 +706,7 @@ TunnelStateData::WriteClientDone(const Comm::ConnectionPointer &, char *buf, siz void TunnelStateData::Connection::dataSent(size_t amount) { - debugs(26, 3, HERE << "len=" << len << " - amount=" << amount); + debugs(26, 3, "len=" << len << " - amount=" << amount); assert(amount == (size_t)len); len =0; /* increment total object size */ @@ -748,7 +748,7 @@ TunnelStateData::Connection::noteClosure() void TunnelStateData::writeClientDone(char *, size_t len, Comm::Flag flag, int xerrno) { - debugs(26, 3, HERE << client.conn << ", " << len << " bytes written, flag=" << flag); + debugs(26, 3, client.conn << ", " << len << " bytes written, flag=" << flag); if (flag == Comm::ERR_CLOSING) return; @@ -762,7 +762,7 @@ TunnelStateData::writeClientDone(char *, size_t len, Comm::Flag flag, int xerrno /* EOF? */ if (len == 0) { - debugs(26, 4, HERE << "Closing client connection due to 0 byte read."); + debugs(26, 4, "Closing client connection due to 0 byte read."); client.conn->close(); return; } @@ -773,7 +773,7 @@ TunnelStateData::writeClientDone(char *, size_t len, Comm::Flag flag, int xerrno /* If the other end has closed, so should we */ if (!Comm::IsConnOpen(server.conn)) { - debugs(26, 4, HERE << "Server has gone away. Terminating client connection."); + debugs(26, 4, "Server has gone away. Terminating client connection."); client.conn->close(); return; } @@ -788,7 +788,7 @@ static void tunnelTimeout(const CommTimeoutCbParams &io) { TunnelStateData *tunnelState = static_cast(io.data); - debugs(26, 3, HERE << io.conn); + debugs(26, 3, io.conn); /* Temporary lock to protect our own feets (comm_close -> tunnelClientClosed -> Free) */ CbcPointer safetyLock(tunnelState); @@ -942,7 +942,7 @@ static void tunnelConnectedWriteDone(const Comm::ConnectionPointer &conn, char *, size_t len, Comm::Flag flag, int, void *data) { TunnelStateData *tunnelState = (TunnelStateData *)data; - debugs(26, 3, HERE << conn << ", flag=" << flag); + debugs(26, 3, conn << ", flag=" << flag); tunnelState->client.writer = NULL; if (flag != Comm::OK) { @@ -1025,7 +1025,7 @@ static void tunnelErrorComplete(int fd/*const Comm::ConnectionPointer &*/, void *data, size_t) { TunnelStateData *tunnelState = (TunnelStateData *)data; - debugs(26, 3, HERE << "FD " << fd); + debugs(26, 3, "FD " << fd); assert(tunnelState != NULL); /* temporary lock to save our own feets (comm_close -> tunnelClientClosed -> Free) */ CbcPointer safetyLock(tunnelState); @@ -1101,7 +1101,7 @@ TunnelStateData::connectDone(const Comm::ConnectionPointer &conn, const char *or void tunnelStart(ClientHttpRequest * http) { - debugs(26, 3, HERE); + debugs(26, 3, MYNAME); /* Create state structure. */ TunnelStateData *tunnelState = NULL; ErrorState *err = NULL; @@ -1125,7 +1125,7 @@ tunnelStart(ClientHttpRequest * http) ch.my_addr = request->my_addr; ch.syncAle(request, http->log_uri); if (ch.fastCheck().denied()) { - debugs(26, 4, HERE << "MISS access forbidden."); + debugs(26, 4, "MISS access forbidden."); err = new ErrorState(ERR_FORWARDING_DENIED, Http::scForbidden, request, http->al); http->al->http.code = Http::scForbidden; errorSend(http->getConn()->clientConnection, err); diff --git a/src/tunnel.h b/src/tunnel.h index 993b703c17..f416c2c2a5 100644 --- a/src/tunnel.h +++ b/src/tunnel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/typedefs.h b/src/typedefs.h index 78f84268df..daed133f68 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/ufsdump.cc b/src/ufsdump.cc index d1b718bc86..ac7d25819a 100644 --- a/src/ufsdump.cc +++ b/src/ufsdump.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/unlinkd.cc b/src/unlinkd.cc index e1e4059f73..1e0dc0c5c4 100644 --- a/src/unlinkd.cc +++ b/src/unlinkd.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/unlinkd.h b/src/unlinkd.h index 1f121f88db..45271c3b3a 100644 --- a/src/unlinkd.h +++ b/src/unlinkd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/unlinkd_daemon.cc b/src/unlinkd_daemon.cc index 894afce4b5..44f40d9b78 100644 --- a/src/unlinkd_daemon.cc +++ b/src/unlinkd_daemon.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/urn.cc b/src/urn.cc index 3e54f27bef..9bc4e0fad2 100644 --- a/src/urn.cc +++ b/src/urn.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/urn.h b/src/urn.h index b13bc4a863..b873c6890c 100644 --- a/src/urn.h +++ b/src/urn.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/wccp.cc b/src/wccp.cc index 15208ad985..ec24ad9e91 100644 --- a/src/wccp.cc +++ b/src/wccp.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/wccp.h b/src/wccp.h index 3b2723aac1..81060813a6 100644 --- a/src/wccp.h +++ b/src/wccp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/wccp2.cc b/src/wccp2.cc index 0eeb9ddd43..09390144e3 100644 --- a/src/wccp2.cc +++ b/src/wccp2.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -1225,344 +1225,344 @@ wccp2HandleUdp(int sock, void *) Must3(ntohs(wccp2_i_see_you.version) == WCCP2_VERSION, "WCCP version unsupported", Here()); Must3(ntohl(wccp2_i_see_you.type) == WCCP2_I_SEE_YOU, "WCCP packet type unsupported", Here()); - // XXX: drop conversion boundary - from_tmp.getSockAddr(from); + // XXX: drop conversion boundary + from_tmp.getSockAddr(from); - debugs(80, 3, "Incoming WCCPv2 I_SEE_YOU length " << ntohs(wccp2_i_see_you.length) << "."); + debugs(80, 3, "Incoming WCCPv2 I_SEE_YOU length " << ntohs(wccp2_i_see_you.length) << "."); - /* Record the total data length */ - const auto data_length = ntohs(wccp2_i_see_you.length); - Must3(data_length <= len - message_header_size, - "malformed packet claiming it's bigger than received data", Here()); + /* Record the total data length */ + const auto data_length = ntohs(wccp2_i_see_you.length); + Must3(data_length <= len - message_header_size, + "malformed packet claiming it's bigger than received data", Here()); - size_t offset = 0; + size_t offset = 0; - /* Go through the data structure */ - while (offset + sizeof(struct wccp2_item_header_t) <= data_length) { + /* Go through the data structure */ + while (offset + sizeof(struct wccp2_item_header_t) <= data_length) { - char *data = wccp2_i_see_you.data; + char *data = wccp2_i_see_you.data; - const auto itemHeader = reinterpret_cast(&data[offset]); - const auto itemSize = CheckFieldDataLength(itemHeader, ntohs(itemHeader->length), - data, data_length, "truncated record"); - // XXX: Check "The specified length must be a multiple of 4 octets" - // requirement to avoid unaligned memory reads after the first item. + const auto itemHeader = reinterpret_cast(&data[offset]); + const auto itemSize = CheckFieldDataLength(itemHeader, ntohs(itemHeader->length), + data, data_length, "truncated record"); + // XXX: Check "The specified length must be a multiple of 4 octets" + // requirement to avoid unaligned memory reads after the first item. - switch (ntohs(itemHeader->type)) { + switch (ntohs(itemHeader->type)) { - case WCCP2_SECURITY_INFO: - Must3(!security_info, "duplicate security definition", Here()); - SetField(security_info, itemHeader, itemHeader, itemSize, - "security definition truncated"); - break; + case WCCP2_SECURITY_INFO: + Must3(!security_info, "duplicate security definition", Here()); + SetField(security_info, itemHeader, itemHeader, itemSize, + "security definition truncated"); + break; - case WCCP2_SERVICE_INFO: - Must3(!service_info, "duplicate service_info definition", Here()); - SetField(service_info, itemHeader, itemHeader, itemSize, - "service_info definition truncated"); - break; + case WCCP2_SERVICE_INFO: + Must3(!service_info, "duplicate service_info definition", Here()); + SetField(service_info, itemHeader, itemHeader, itemSize, + "service_info definition truncated"); + break; - case WCCP2_ROUTER_ID_INFO: - Must3(!router_identity_info, "duplicate router_identity_info definition", Here()); - SetField(router_identity_info, itemHeader, itemHeader, itemSize, - "router_identity_info definition truncated"); - break; + case WCCP2_ROUTER_ID_INFO: + Must3(!router_identity_info, "duplicate router_identity_info definition", Here()); + SetField(router_identity_info, itemHeader, itemHeader, itemSize, + "router_identity_info definition truncated"); + break; - case WCCP2_RTR_VIEW_INFO: - Must3(!router_view_header, "duplicate router_view definition", Here()); - SetField(router_view_header, itemHeader, itemHeader, itemSize, - "router_view definition truncated"); - break; + case WCCP2_RTR_VIEW_INFO: + Must3(!router_view_header, "duplicate router_view definition", Here()); + SetField(router_view_header, itemHeader, itemHeader, itemSize, + "router_view definition truncated"); + break; - case WCCP2_CAPABILITY_INFO: { - Must3(!router_capability_header, "duplicate router_capability definition", Here()); - SetField(router_capability_header, itemHeader, itemHeader, itemSize, - "router_capability definition truncated"); + case WCCP2_CAPABILITY_INFO: { + Must3(!router_capability_header, "duplicate router_capability definition", Here()); + SetField(router_capability_header, itemHeader, itemHeader, itemSize, + "router_capability definition truncated"); - CheckFieldDataLength(router_capability_header, ntohs(router_capability_header->capability_info_length), - itemHeader, itemSize, "capability info truncated"); - router_capability_data_start = reinterpret_cast(router_capability_header) + - sizeof(*router_capability_header); - break; - } + CheckFieldDataLength(router_capability_header, ntohs(router_capability_header->capability_info_length), + itemHeader, itemSize, "capability info truncated"); + router_capability_data_start = reinterpret_cast(router_capability_header) + + sizeof(*router_capability_header); + break; + } - /* Nothing to do for the types below */ + /* Nothing to do for the types below */ - case WCCP2_ASSIGN_MAP: - case WCCP2_REDIRECT_ASSIGNMENT: - break; + case WCCP2_ASSIGN_MAP: + case WCCP2_REDIRECT_ASSIGNMENT: + break; - default: - debugs(80, DBG_IMPORTANT, "ERROR: Unknown record type in WCCPv2 Packet (" << ntohs(itemHeader->type) << ")."); + default: + debugs(80, DBG_IMPORTANT, "ERROR: Unknown record type in WCCPv2 Packet (" << ntohs(itemHeader->type) << ")."); + } + + offset += itemSize; + assert(offset <= data_length && "CheckFieldDataLength(itemHeader...) established that"); } - offset += itemSize; - assert(offset <= data_length && "CheckFieldDataLength(itemHeader...) established that"); - } + Must3(security_info, "packet missing security definition", Here()); + Must3(service_info, "packet missing service_info definition", Here()); + Must3(router_identity_info, "packet missing router_identity_info definition", Here()); + Must3(router_view_header, "packet missing router_view definition", Here()); - Must3(security_info, "packet missing security definition", Here()); - Must3(service_info, "packet missing service_info definition", Here()); - Must3(router_identity_info, "packet missing router_identity_info definition", Here()); - Must3(router_view_header, "packet missing router_view definition", Here()); + debugs(80, 5, "Complete packet received"); - debugs(80, 5, "Complete packet received"); + /* Check that the service in the packet is configured on this router */ + service_list_ptr = wccp2_service_list_head; - /* Check that the service in the packet is configured on this router */ - service_list_ptr = wccp2_service_list_head; + while (service_list_ptr != NULL) { + if (service_info->service_id == service_list_ptr->service_info->service_id) { + break; + } - while (service_list_ptr != NULL) { - if (service_info->service_id == service_list_ptr->service_info->service_id) { - break; + service_list_ptr = service_list_ptr->next; } - service_list_ptr = service_list_ptr->next; - } + if (service_list_ptr == NULL) { + debugs(80, DBG_IMPORTANT, "ERROR: WCCPv2 Unknown service received from router (" << service_info->service_id << ")"); + return; + } - if (service_list_ptr == NULL) { - debugs(80, DBG_IMPORTANT, "ERROR: WCCPv2 Unknown service received from router (" << service_info->service_id << ")"); - return; - } + if (ntohl(security_info->security_option) != ntohl(service_list_ptr->security_info->security_option)) { + debugs(80, DBG_IMPORTANT, "ERROR: Invalid security option in WCCPv2 Packet (" << ntohl(security_info->security_option) << " vs " << ntohl(service_list_ptr->security_info->security_option) << ")."); + return; + } - if (ntohl(security_info->security_option) != ntohl(service_list_ptr->security_info->security_option)) { - debugs(80, DBG_IMPORTANT, "ERROR: Invalid security option in WCCPv2 Packet (" << ntohl(security_info->security_option) << " vs " << ntohl(service_list_ptr->security_info->security_option) << ")."); - return; - } + if (!wccp2_check_security(service_list_ptr, (char *) security_info, (char *) &wccp2_i_see_you, len)) { + debugs(80, DBG_IMPORTANT, "ERROR: Received WCCPv2 Packet failed authentication"); + return; + } - if (!wccp2_check_security(service_list_ptr, (char *) security_info, (char *) &wccp2_i_see_you, len)) { - debugs(80, DBG_IMPORTANT, "ERROR: Received WCCPv2 Packet failed authentication"); - return; - } + /* Check that the router address is configured on this router */ + for (router_list_ptr = &service_list_ptr->router_list_head; router_list_ptr->next != NULL; router_list_ptr = router_list_ptr->next) { + if (router_list_ptr->router_sendto_address.s_addr == from.sin_addr.s_addr) + break; + } - /* Check that the router address is configured on this router */ - for (router_list_ptr = &service_list_ptr->router_list_head; router_list_ptr->next != NULL; router_list_ptr = router_list_ptr->next) { - if (router_list_ptr->router_sendto_address.s_addr == from.sin_addr.s_addr) - break; - } + Must3(router_list_ptr->next, "packet received from unknown router", Here()); - Must3(router_list_ptr->next, "packet received from unknown router", Here()); + /* Set the router id */ + router_list_ptr->info->router_address = router_identity_info->router_id_element.router_address; - /* Set the router id */ - router_list_ptr->info->router_address = router_identity_info->router_id_element.router_address; + /* Increment the received id in the packet */ + if (ntohl(router_list_ptr->info->received_id) != ntohl(router_identity_info->router_id_element.received_id)) { + debugs(80, 3, "Incoming WCCP2_I_SEE_YOU Received ID old=" << ntohl(router_list_ptr->info->received_id) << " new=" << ntohl(router_identity_info->router_id_element.received_id) << "."); + router_list_ptr->info->received_id = router_identity_info->router_id_element.received_id; + } - /* Increment the received id in the packet */ - if (ntohl(router_list_ptr->info->received_id) != ntohl(router_identity_info->router_id_element.received_id)) { - debugs(80, 3, "Incoming WCCP2_I_SEE_YOU Received ID old=" << ntohl(router_list_ptr->info->received_id) << " new=" << ntohl(router_identity_info->router_id_element.received_id) << "."); - router_list_ptr->info->received_id = router_identity_info->router_id_element.received_id; - } + /* TODO: check return/forwarding methods */ + if (router_capability_header == NULL) { + if ((Config.Wccp2.return_method != WCCP2_PACKET_RETURN_METHOD_GRE) || (Config.Wccp2.forwarding_method != WCCP2_FORWARDING_METHOD_GRE)) { + debugs(80, DBG_IMPORTANT, "ERROR: wccp2HandleUdp: fatal error - A WCCP router does not support the forwarding method specified, only GRE supported"); + wccp2ConnectionClose(); + return; + } + } else { - /* TODO: check return/forwarding methods */ - if (router_capability_header == NULL) { - if ((Config.Wccp2.return_method != WCCP2_PACKET_RETURN_METHOD_GRE) || (Config.Wccp2.forwarding_method != WCCP2_FORWARDING_METHOD_GRE)) { - debugs(80, DBG_IMPORTANT, "ERROR: wccp2HandleUdp: fatal error - A WCCP router does not support the forwarding method specified, only GRE supported"); - wccp2ConnectionClose(); - return; - } - } else { + const auto router_capability_data_length = ntohs(router_capability_header->capability_info_length); + assert(router_capability_data_start); + const auto router_capability_data_end = router_capability_data_start + + router_capability_data_length; + for (auto router_capability_data_current = router_capability_data_start; + router_capability_data_current < router_capability_data_end;) { + + SetField(router_capability_element, router_capability_data_current, + router_capability_data_start, router_capability_data_length, + "capability element header truncated"); + const auto elementSize = CheckFieldDataLength( + router_capability_element, ntohs(router_capability_element->capability_length), + router_capability_data_start, router_capability_data_length, + "capability element truncated"); + + switch (ntohs(router_capability_element->capability_type)) { + + case WCCP2_CAPABILITY_FORWARDING_METHOD: + + if (!(ntohl(router_capability_element->capability_value) & Config.Wccp2.forwarding_method)) { + debugs(80, DBG_IMPORTANT, "ERROR: wccp2HandleUdp: fatal error - A WCCP router has specified a different forwarding method " << ntohl(router_capability_element->capability_value) << ", expected " << Config.Wccp2.forwarding_method); + wccp2ConnectionClose(); + return; + } - const auto router_capability_data_length = ntohs(router_capability_header->capability_info_length); - assert(router_capability_data_start); - const auto router_capability_data_end = router_capability_data_start + - router_capability_data_length; - for (auto router_capability_data_current = router_capability_data_start; - router_capability_data_current < router_capability_data_end;) { - - SetField(router_capability_element, router_capability_data_current, - router_capability_data_start, router_capability_data_length, - "capability element header truncated"); - const auto elementSize = CheckFieldDataLength( - router_capability_element, ntohs(router_capability_element->capability_length), - router_capability_data_start, router_capability_data_length, - "capability element truncated"); - - switch (ntohs(router_capability_element->capability_type)) { - - case WCCP2_CAPABILITY_FORWARDING_METHOD: - - if (!(ntohl(router_capability_element->capability_value) & Config.Wccp2.forwarding_method)) { - debugs(80, DBG_IMPORTANT, "ERROR: wccp2HandleUdp: fatal error - A WCCP router has specified a different forwarding method " << ntohl(router_capability_element->capability_value) << ", expected " << Config.Wccp2.forwarding_method); - wccp2ConnectionClose(); - return; - } + break; - break; + case WCCP2_CAPABILITY_ASSIGNMENT_METHOD: - case WCCP2_CAPABILITY_ASSIGNMENT_METHOD: + if (!(ntohl(router_capability_element->capability_value) & Config.Wccp2.assignment_method)) { + debugs(80, DBG_IMPORTANT, "ERROR: wccp2HandleUdp: fatal error - A WCCP router has specified a different assignment method " << ntohl(router_capability_element->capability_value) << ", expected "<< Config.Wccp2.assignment_method); + wccp2ConnectionClose(); + return; + } - if (!(ntohl(router_capability_element->capability_value) & Config.Wccp2.assignment_method)) { - debugs(80, DBG_IMPORTANT, "ERROR: wccp2HandleUdp: fatal error - A WCCP router has specified a different assignment method " << ntohl(router_capability_element->capability_value) << ", expected "<< Config.Wccp2.assignment_method); - wccp2ConnectionClose(); - return; - } + break; - break; + case WCCP2_CAPABILITY_RETURN_METHOD: - case WCCP2_CAPABILITY_RETURN_METHOD: + if (!(ntohl(router_capability_element->capability_value) & Config.Wccp2.return_method)) { + debugs(80, DBG_IMPORTANT, "ERROR: wccp2HandleUdp: fatal error - A WCCP router has specified a different return method " << ntohl(router_capability_element->capability_value) << ", expected " << Config.Wccp2.return_method); + wccp2ConnectionClose(); + return; + } - if (!(ntohl(router_capability_element->capability_value) & Config.Wccp2.return_method)) { - debugs(80, DBG_IMPORTANT, "ERROR: wccp2HandleUdp: fatal error - A WCCP router has specified a different return method " << ntohl(router_capability_element->capability_value) << ", expected " << Config.Wccp2.return_method); - wccp2ConnectionClose(); - return; - } + break; - break; + case 4: + case 5: + break; // ignore silently for now - case 4: - case 5: - break; // ignore silently for now + default: + debugs(80, DBG_IMPORTANT, "ERROR: Unknown capability type in WCCPv2 Packet (" << ntohs(router_capability_element->capability_type) << ")."); + } - default: - debugs(80, DBG_IMPORTANT, "ERROR: Unknown capability type in WCCPv2 Packet (" << ntohs(router_capability_element->capability_type) << ")."); + router_capability_data_current += elementSize; } - - router_capability_data_current += elementSize; } - } - debugs(80, 5, "Cleaning out cache list"); - /* clean out the old cache list */ + debugs(80, 5, "Cleaning out cache list"); + /* clean out the old cache list */ - for (cache_list_ptr = &router_list_ptr->cache_list_head; cache_list_ptr; cache_list_ptr = cache_list_ptr_next) { - cache_list_ptr_next = cache_list_ptr->next; + for (cache_list_ptr = &router_list_ptr->cache_list_head; cache_list_ptr; cache_list_ptr = cache_list_ptr_next) { + cache_list_ptr_next = cache_list_ptr->next; - if (cache_list_ptr != &router_list_ptr->cache_list_head) { - xfree(cache_list_ptr); + if (cache_list_ptr != &router_list_ptr->cache_list_head) { + xfree(cache_list_ptr); + } } - } - router_list_ptr->num_caches = htonl(0); - num_caches = 0; + router_list_ptr->num_caches = htonl(0); + num_caches = 0; - /* Check to see if we're the master cache and update the cache list */ - bool found = false; - service_list_ptr->lowest_ip = 1; - cache_list_ptr = &router_list_ptr->cache_list_head; + /* Check to see if we're the master cache and update the cache list */ + bool found = false; + service_list_ptr->lowest_ip = 1; + cache_list_ptr = &router_list_ptr->cache_list_head; - /* to find the list of caches, we start at the end of the router view header */ + /* to find the list of caches, we start at the end of the router view header */ - ptr = (char *) (router_view_header) + sizeof(struct router_view_t); - const auto router_view_size = sizeof(struct router_view_t) + - ntohs(router_view_header->header.length); + ptr = (char *) (router_view_header) + sizeof(struct router_view_t); + const auto router_view_size = sizeof(struct router_view_t) + + ntohs(router_view_header->header.length); - /* Then we read the number of routers */ - const uint32_t *routerCountRaw = nullptr; - SetField(routerCountRaw, ptr, router_view_header, router_view_size, - "malformed packet (truncated router view info w/o number of routers)"); + /* Then we read the number of routers */ + const uint32_t *routerCountRaw = nullptr; + SetField(routerCountRaw, ptr, router_view_header, router_view_size, + "malformed packet (truncated router view info w/o number of routers)"); - /* skip the number plus all the ip's */ - ptr += sizeof(*routerCountRaw); - const auto ipCount = ntohl(*routerCountRaw); - const auto ipsSize = ipCount * sizeof(struct in_addr); // we check for unsigned overflow below - Must3(ipsSize / sizeof(struct in_addr) != ipCount, "huge IP address count", Here()); - CheckSectionLength(ptr, ipsSize, router_view_header, router_view_size, "invalid IP address count"); - ptr += ipsSize; + /* skip the number plus all the ip's */ + ptr += sizeof(*routerCountRaw); + const auto ipCount = ntohl(*routerCountRaw); + const auto ipsSize = ipCount * sizeof(struct in_addr); // we check for unsigned overflow below + Must3(ipsSize / sizeof(struct in_addr) != ipCount, "huge IP address count", Here()); + CheckSectionLength(ptr, ipsSize, router_view_header, router_view_size, "invalid IP address count"); + ptr += ipsSize; - /* Then read the number of caches */ - const uint32_t *cacheCountRaw = nullptr; - SetField(cacheCountRaw, ptr, router_view_header, router_view_size, - "malformed packet (truncated router view info w/o cache count)"); - memcpy(&tmp, cacheCountRaw, sizeof(tmp)); // TODO: Replace tmp with cacheCount - ptr += sizeof(tmp); + /* Then read the number of caches */ + const uint32_t *cacheCountRaw = nullptr; + SetField(cacheCountRaw, ptr, router_view_header, router_view_size, + "malformed packet (truncated router view info w/o cache count)"); + memcpy(&tmp, cacheCountRaw, sizeof(tmp)); // TODO: Replace tmp with cacheCount + ptr += sizeof(tmp); - if (ntohl(tmp) != 0) { - /* search through the list of received-from ip addresses */ + if (ntohl(tmp) != 0) { + /* search through the list of received-from ip addresses */ - for (num_caches = 0; num_caches < (int) ntohl(tmp); ++num_caches) { - /* Get a copy of the ip */ - memset(&cache_address, 0, sizeof(cache_address)); // Make GCC happy + for (num_caches = 0; num_caches < (int) ntohl(tmp); ++num_caches) { + /* Get a copy of the ip */ + memset(&cache_address, 0, sizeof(cache_address)); // Make GCC happy - switch (Config.Wccp2.assignment_method) { + switch (Config.Wccp2.assignment_method) { - case WCCP2_ASSIGNMENT_METHOD_HASH: + case WCCP2_ASSIGNMENT_METHOD_HASH: - SetField(cache_identity, ptr, router_view_header, router_view_size, - "malformed packet (truncated router view info cache w/o assignment hash)"); + SetField(cache_identity, ptr, router_view_header, router_view_size, + "malformed packet (truncated router view info cache w/o assignment hash)"); - ptr += sizeof(struct wccp2_cache_identity_info_t); + ptr += sizeof(struct wccp2_cache_identity_info_t); - memcpy(&cache_address, &cache_identity->addr, sizeof(struct in_addr)); + memcpy(&cache_address, &cache_identity->addr, sizeof(struct in_addr)); - cache_list_ptr->weight = ntohs(cache_identity->weight); - break; + cache_list_ptr->weight = ntohs(cache_identity->weight); + break; - case WCCP2_ASSIGNMENT_METHOD_MASK: + case WCCP2_ASSIGNMENT_METHOD_MASK: - SetField(cache_mask_info, ptr, router_view_header, router_view_size, - "malformed packet (truncated router view info cache w/o assignment mask)"); + SetField(cache_mask_info, ptr, router_view_header, router_view_size, + "malformed packet (truncated router view info cache w/o assignment mask)"); - /* The mask assignment has an undocumented variable length entry here */ + /* The mask assignment has an undocumented variable length entry here */ - if (ntohl(cache_mask_info->num1) == 3) { + if (ntohl(cache_mask_info->num1) == 3) { - SetField(cache_mask_identity, ptr, router_view_header, router_view_size, - "malformed packet (truncated router view info cache w/o assignment mask identity)"); + SetField(cache_mask_identity, ptr, router_view_header, router_view_size, + "malformed packet (truncated router view info cache w/o assignment mask identity)"); - ptr += sizeof(struct wccp2_cache_mask_identity_info_t); + ptr += sizeof(struct wccp2_cache_mask_identity_info_t); - memcpy(&cache_address, &cache_mask_identity->addr, sizeof(struct in_addr)); - } else { + memcpy(&cache_address, &cache_mask_identity->addr, sizeof(struct in_addr)); + } else { - ptr += sizeof(struct cache_mask_info_t); + ptr += sizeof(struct cache_mask_info_t); - memcpy(&cache_address, &cache_mask_info->addr, sizeof(struct in_addr)); - } + memcpy(&cache_address, &cache_mask_info->addr, sizeof(struct in_addr)); + } - cache_list_ptr->weight = 0; - break; + cache_list_ptr->weight = 0; + break; - default: - fatalf("Unknown Wccp2 assignment method\n"); - } + default: + fatalf("Unknown Wccp2 assignment method\n"); + } - /* Update the cache list */ - cache_list_ptr->cache_ip = cache_address; + /* Update the cache list */ + cache_list_ptr->cache_ip = cache_address; - cache_list_ptr->next = (wccp2_cache_list_t*) xcalloc(1, sizeof(struct wccp2_cache_list_t)); + cache_list_ptr->next = (wccp2_cache_list_t*) xcalloc(1, sizeof(struct wccp2_cache_list_t)); - cache_list_ptr = cache_list_ptr->next; + cache_list_ptr = cache_list_ptr->next; - cache_list_ptr->next = NULL; + cache_list_ptr->next = NULL; - debugs (80, 5, "checking cache list: (" << std::hex << cache_address.s_addr << ":" << router_list_ptr->local_ip.s_addr << ")"); + debugs (80, 5, "checking cache list: (" << std::hex << cache_address.s_addr << ":" << router_list_ptr->local_ip.s_addr << ")"); - /* Check to see if it's the master, or us */ - found = found || (cache_address.s_addr == router_list_ptr->local_ip.s_addr); + /* Check to see if it's the master, or us */ + found = found || (cache_address.s_addr == router_list_ptr->local_ip.s_addr); - if (cache_address.s_addr < router_list_ptr->local_ip.s_addr) { - service_list_ptr->lowest_ip = 0; + if (cache_address.s_addr < router_list_ptr->local_ip.s_addr) { + service_list_ptr->lowest_ip = 0; + } } - } - } else { - debugs(80, 5, "Adding ourselves as the only cache"); + } else { + debugs(80, 5, "Adding ourselves as the only cache"); - /* Update the cache list */ - cache_list_ptr->cache_ip = router_list_ptr->local_ip; + /* Update the cache list */ + cache_list_ptr->cache_ip = router_list_ptr->local_ip; - cache_list_ptr->next = (wccp2_cache_list_t*) xcalloc(1, sizeof(struct wccp2_cache_list_t)); - cache_list_ptr = cache_list_ptr->next; - cache_list_ptr->next = NULL; + cache_list_ptr->next = (wccp2_cache_list_t*) xcalloc(1, sizeof(struct wccp2_cache_list_t)); + cache_list_ptr = cache_list_ptr->next; + cache_list_ptr->next = NULL; - service_list_ptr->lowest_ip = 1; - found = true; - num_caches = 1; - } + service_list_ptr->lowest_ip = 1; + found = true; + num_caches = 1; + } - wccp2SortCacheList(&router_list_ptr->cache_list_head); + wccp2SortCacheList(&router_list_ptr->cache_list_head); - router_list_ptr->num_caches = htonl(num_caches); + router_list_ptr->num_caches = htonl(num_caches); - if (found && (service_list_ptr->lowest_ip == 1)) { - if (ntohl(router_view_header->change_number) != router_list_ptr->member_change) { - debugs(80, 4, "Change detected - queueing up new assignment"); - router_list_ptr->member_change = ntohl(router_view_header->change_number); - eventDelete(wccp2AssignBuckets, NULL); - eventAdd("wccp2AssignBuckets", wccp2AssignBuckets, NULL, 15.0, 1); + if (found && (service_list_ptr->lowest_ip == 1)) { + if (ntohl(router_view_header->change_number) != router_list_ptr->member_change) { + debugs(80, 4, "Change detected - queueing up new assignment"); + router_list_ptr->member_change = ntohl(router_view_header->change_number); + eventDelete(wccp2AssignBuckets, NULL); + eventAdd("wccp2AssignBuckets", wccp2AssignBuckets, NULL, 15.0, 1); + } else { + debugs(80, 5, "Change not detected (" << ntohl(router_view_header->change_number) << " = " << router_list_ptr->member_change << ")"); + } } else { - debugs(80, 5, "Change not detected (" << ntohl(router_view_header->change_number) << " = " << router_list_ptr->member_change << ")"); + eventDelete(wccp2AssignBuckets, NULL); + debugs(80, 5, "I am not the lowest ip cache - not assigning buckets"); } - } else { - eventDelete(wccp2AssignBuckets, NULL); - debugs(80, 5, "I am not the lowest ip cache - not assigning buckets"); - } } catch (...) { debugs(80, DBG_IMPORTANT, "ERROR: Ignoring WCCPv2 message: " << CurrentException); diff --git a/src/wccp2.h b/src/wccp2.h index 6986a3018a..d42eeca25b 100644 --- a/src/wccp2.h +++ b/src/wccp2.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/whois.cc b/src/whois.cc index eb2380fbf7..8484ed493f 100644 --- a/src/whois.cc +++ b/src/whois.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. @@ -87,7 +87,7 @@ static void whoisTimeout(const CommTimeoutCbParams &io) { WhoisState *p = static_cast(io.data); - debugs(75, 3, HERE << io.conn << ", URL " << p->entry->url()); + debugs(75, 3, io.conn << ", URL " << p->entry->url()); io.conn->close(); } @@ -116,7 +116,7 @@ WhoisState::readReply(const Comm::ConnectionPointer &conn, char *aBuffer, size_t return; aBuffer[aBufferLength] = '\0'; - debugs(75, 3, HERE << conn << " read " << aBufferLength << " bytes"); + debugs(75, 3, conn << " read " << aBufferLength << " bytes"); debugs(75, 5, "{" << aBuffer << "}"); // TODO: Honor delay pools. diff --git a/src/whois.h b/src/whois.h index 8b1808a8a5..1603e993a9 100644 --- a/src/whois.h +++ b/src/whois.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/win32.cc b/src/win32.cc index e9e39747f9..42823bf8c6 100644 --- a/src/win32.cc +++ b/src/win32.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/win32.h b/src/win32.h index 4e9b343900..58d2137f00 100644 --- a/src/win32.h +++ b/src/win32.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/wordlist.cc b/src/wordlist.cc index c75eee75ce..fa2292bc8d 100644 --- a/src/wordlist.cc +++ b/src/wordlist.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/src/wordlist.h b/src/wordlist.h index 6f93655161..a2e6a7d85c 100644 --- a/src/wordlist.h +++ b/src/wordlist.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-builds.sh b/test-builds.sh index 08a22262f5..a1b278ef96 100755 --- a/test-builds.sh +++ b/test-builds.sh @@ -1,7 +1,7 @@ #!/bin/sh # ## -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/ESIExpressions.cc b/test-suite/ESIExpressions.cc index 8c9edd86d2..5a79808866 100644 --- a/test-suite/ESIExpressions.cc +++ b/test-suite/ESIExpressions.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am index 75b86a7c9e..e0735b0a3b 100644 --- a/test-suite/Makefile.am +++ b/test-suite/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/VirtualDeleteOperator.cc b/test-suite/VirtualDeleteOperator.cc index e062c342a4..6f28b3b597 100644 --- a/test-suite/VirtualDeleteOperator.cc +++ b/test-suite/VirtualDeleteOperator.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/basic_test.sh b/test-suite/basic_test.sh index 45af992df7..9eb3fddeda 100755 --- a/test-suite/basic_test.sh +++ b/test-suite/basic_test.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/buildtest.sh b/test-suite/buildtest.sh index 343e37c1cb..4e065bbbc1 100755 --- a/test-suite/buildtest.sh +++ b/test-suite/buildtest.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/buildtests/layer-00-default.opts b/test-suite/buildtests/layer-00-default.opts index c344dab21a..5e576c0d22 100644 --- a/test-suite/buildtests/layer-00-default.opts +++ b/test-suite/buildtests/layer-00-default.opts @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/buildtests/layer-01-minimal.opts b/test-suite/buildtests/layer-01-minimal.opts index 26d30d8ee8..a52c12abd0 100644 --- a/test-suite/buildtests/layer-01-minimal.opts +++ b/test-suite/buildtests/layer-01-minimal.opts @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/buildtests/layer-02-maximus.opts b/test-suite/buildtests/layer-02-maximus.opts index bc9c33b133..fef7d884a8 100644 --- a/test-suite/buildtests/layer-02-maximus.opts +++ b/test-suite/buildtests/layer-02-maximus.opts @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/buildtests/layer-04-noauth-everything.opts b/test-suite/buildtests/layer-04-noauth-everything.opts index 87d957bbed..e70ad03029 100644 --- a/test-suite/buildtests/layer-04-noauth-everything.opts +++ b/test-suite/buildtests/layer-04-noauth-everything.opts @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/buildtests/os-debian.opts b/test-suite/buildtests/os-debian.opts index ec684d04ae..2a8cb5a236 100644 --- a/test-suite/buildtests/os-debian.opts +++ b/test-suite/buildtests/os-debian.opts @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/buildtests/os-mingw.opts b/test-suite/buildtests/os-mingw.opts index 495ba8d42c..d1c792bc84 100644 --- a/test-suite/buildtests/os-mingw.opts +++ b/test-suite/buildtests/os-mingw.opts @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/buildtests/os-ubuntu.opts b/test-suite/buildtests/os-ubuntu.opts index b0a831af3c..1c634c46dc 100644 --- a/test-suite/buildtests/os-ubuntu.opts +++ b/test-suite/buildtests/os-ubuntu.opts @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/debug.cc b/test-suite/debug.cc index a847649250..44435ed9ee 100644 --- a/test-suite/debug.cc +++ b/test-suite/debug.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/htcp-client.pl b/test-suite/htcp-client.pl index 2f867220c3..4c1a4c8a72 100755 --- a/test-suite/htcp-client.pl +++ b/test-suite/htcp-client.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/mem_hdr_test.cc b/test-suite/mem_hdr_test.cc index 5a627487ec..f5934f4fbc 100644 --- a/test-suite/mem_hdr_test.cc +++ b/test-suite/mem_hdr_test.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/mem_node_test.cc b/test-suite/mem_node_test.cc index cd3ecf7225..919ac8dada 100644 --- a/test-suite/mem_node_test.cc +++ b/test-suite/mem_node_test.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/negotiate_test.sh b/test-suite/negotiate_test.sh index 6da5fe3874..3833008203 100755 --- a/test-suite/negotiate_test.sh +++ b/test-suite/negotiate_test.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/ntlm_test.sh b/test-suite/ntlm_test.sh index f9dff1a723..d2864b21b2 100755 --- a/test-suite/ntlm_test.sh +++ b/test-suite/ntlm_test.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/pconn-banger.c b/test-suite/pconn-banger.c index 2f2b735939..f45eca398e 100644 --- a/test-suite/pconn-banger.c +++ b/test-suite/pconn-banger.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/run_negotiate_test.sh b/test-suite/run_negotiate_test.sh index 0f391d8d39..a0c2316345 100755 --- a/test-suite/run_negotiate_test.sh +++ b/test-suite/run_negotiate_test.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/run_ntlm_test.sh b/test-suite/run_ntlm_test.sh index ca9e1ad0de..5f3316955a 100755 --- a/test-suite/run_ntlm_test.sh +++ b/test-suite/run_ntlm_test.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/splay.cc b/test-suite/splay.cc index 2c9ae8c0c4..81ded31f9f 100644 --- a/test-suite/splay.cc +++ b/test-suite/splay.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/squidconf/external_acl_type b/test-suite/squidconf/external_acl_type index a51b4e5008..8796793cf6 100644 --- a/test-suite/squidconf/external_acl_type +++ b/test-suite/squidconf/external_acl_type @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/squidconf/mgr_passwd b/test-suite/squidconf/mgr_passwd index 99dbeef02c..b9e42e33bc 100644 --- a/test-suite/squidconf/mgr_passwd +++ b/test-suite/squidconf/mgr_passwd @@ -1,4 +1,4 @@ -# Copyright (C) 1996-2021 The Squid Software Foundation and contributors +# Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/squidconf/regex b/test-suite/squidconf/regex index a40426cb5b..95c82a8d16 100644 --- a/test-suite/squidconf/regex +++ b/test-suite/squidconf/regex @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/squidconf/regressions-3.3 b/test-suite/squidconf/regressions-3.3 index 791d2f5917..f4c3da232b 100644 --- a/test-suite/squidconf/regressions-3.3 +++ b/test-suite/squidconf/regressions-3.3 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/squidconf/regressions-3.4.0.1 b/test-suite/squidconf/regressions-3.4.0.1 index 41a441bd95..853a8488c9 100644 --- a/test-suite/squidconf/regressions-3.4.0.1 +++ b/test-suite/squidconf/regressions-3.4.0.1 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/squidconf/regressions-3.5.0.2 b/test-suite/squidconf/regressions-3.5.0.2 index fcc9650a60..5ef929cce9 100644 --- a/test-suite/squidconf/regressions-3.5.0.2 +++ b/test-suite/squidconf/regressions-3.5.0.2 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/squidconf/regressions-4.0.18 b/test-suite/squidconf/regressions-4.0.18 index 38cf588e08..2aafa81d4b 100644 --- a/test-suite/squidconf/regressions-4.0.18 +++ b/test-suite/squidconf/regressions-4.0.18 @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/squidconf/time_units b/test-suite/squidconf/time_units index c97d9b7528..55cc4e68f8 100644 --- a/test-suite/squidconf/time_units +++ b/test-suite/squidconf/time_units @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/syntheticoperators.cc b/test-suite/syntheticoperators.cc index 578ea135a2..16119fde04 100644 --- a/test-suite/syntheticoperators.cc +++ b/test-suite/syntheticoperators.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/tcp-banger2.c b/test-suite/tcp-banger2.c index 965d6e51d0..2cc6a2d6a5 100644 --- a/test-suite/tcp-banger2.c +++ b/test-suite/tcp-banger2.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/tcp-banger3.c b/test-suite/tcp-banger3.c index 43bf3b5a17..e8ae55d0f3 100644 --- a/test-suite/tcp-banger3.c +++ b/test-suite/tcp-banger3.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/test_tools.cc b/test-suite/test_tools.cc index 76ddfaff41..de1075e01b 100644 --- a/test-suite/test_tools.cc +++ b/test-suite/test_tools.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/test-suite/testheaders.sh b/test-suite/testheaders.sh index db993fffc5..b25a1727e4 100755 --- a/test-suite/testheaders.sh +++ b/test-suite/testheaders.sh @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/test-suite/waiter.c b/test-suite/waiter.c index edeb9c978b..a4668d8dba 100644 --- a/test-suite/waiter.c +++ b/test-suite/waiter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/Makefile.am b/tools/Makefile.am index f1511417bc..4ee6199d6d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/apparmor/Makefile.am b/tools/apparmor/Makefile.am index 6135ca8ab5..82d36e02af 100644 --- a/tools/apparmor/Makefile.am +++ b/tools/apparmor/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/apparmor/usr.sbin.squid b/tools/apparmor/usr.sbin.squid index 6b6186e73a..904eb53d47 100644 --- a/tools/apparmor/usr.sbin.squid +++ b/tools/apparmor/usr.sbin.squid @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc index 8cc5ff6282..b59dfa6447 100644 --- a/tools/cachemgr.cc +++ b/tools/cachemgr.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/cachemgr.cgi.8.in b/tools/cachemgr.cgi.8.in index 6605aaf8e6..5fbbd92cb2 100644 --- a/tools/cachemgr.cgi.8.in +++ b/tools/cachemgr.cgi.8.in @@ -54,7 +54,7 @@ the National Science Foundation. . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/cachemgr.conf b/tools/cachemgr.conf index 5bdbecc9be..b9c772427b 100644 --- a/tools/cachemgr.conf +++ b/tools/cachemgr.conf @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/helper-mux/Makefile.am b/tools/helper-mux/Makefile.am index ec075ddcd9..c78fce9b1b 100644 --- a/tools/helper-mux/Makefile.am +++ b/tools/helper-mux/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/helper-mux/helper-mux.pl.in b/tools/helper-mux/helper-mux.pl.in index eca5418cb3..be432e8fea 100755 --- a/tools/helper-mux/helper-mux.pl.in +++ b/tools/helper-mux/helper-mux.pl.in @@ -54,7 +54,7 @@ It is not yet able to manage dying helpers. =head1 COPYRIGHT - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/helper-ok-dying.pl b/tools/helper-ok-dying.pl index eb8bad9480..888012b444 100755 --- a/tools/helper-ok-dying.pl +++ b/tools/helper-ok-dying.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/helper-ok.pl b/tools/helper-ok.pl index dbaebd46c8..5016e78f20 100755 --- a/tools/helper-ok.pl +++ b/tools/helper-ok.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/purge/Makefile.am b/tools/purge/Makefile.am index f1909eb23f..fe4459320a 100644 --- a/tools/purge/Makefile.am +++ b/tools/purge/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/purge/conffile.cc b/tools/purge/conffile.cc index ebf4e919b7..25e5626214 100644 --- a/tools/purge/conffile.cc +++ b/tools/purge/conffile.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/conffile.hh b/tools/purge/conffile.hh index 82f151e79f..a467ceb2b5 100644 --- a/tools/purge/conffile.hh +++ b/tools/purge/conffile.hh @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/convert.cc b/tools/purge/convert.cc index 74512849d6..e57451a583 100644 --- a/tools/purge/convert.cc +++ b/tools/purge/convert.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/convert.hh b/tools/purge/convert.hh index f7e4466572..c7691e688e 100644 --- a/tools/purge/convert.hh +++ b/tools/purge/convert.hh @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/copyout.cc b/tools/purge/copyout.cc index aebe77cfa4..7a16326d43 100644 --- a/tools/purge/copyout.cc +++ b/tools/purge/copyout.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/copyout.hh b/tools/purge/copyout.hh index 87a11850e2..5898b6a173 100644 --- a/tools/purge/copyout.hh +++ b/tools/purge/copyout.hh @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/purge.1 b/tools/purge/purge.1 index 202d35d3aa..2a8585ed1f 100644 --- a/tools/purge/purge.1 +++ b/tools/purge/purge.1 @@ -260,7 +260,7 @@ Based on original squidpurge README. . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc index ae293a75aa..5a37f0dc59 100644 --- a/tools/purge/purge.cc +++ b/tools/purge/purge.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/signal.cc b/tools/purge/signal.cc index 657efd15c1..d9ec661ace 100644 --- a/tools/purge/signal.cc +++ b/tools/purge/signal.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/signal.hh b/tools/purge/signal.hh index 051f8c9c57..7b99047c4d 100644 --- a/tools/purge/signal.hh +++ b/tools/purge/signal.hh @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/socket.cc b/tools/purge/socket.cc index f3e2279ba3..19abd0f4fe 100644 --- a/tools/purge/socket.cc +++ b/tools/purge/socket.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/socket.hh b/tools/purge/socket.hh index 15526b3925..0923c5e169 100644 --- a/tools/purge/socket.hh +++ b/tools/purge/socket.hh @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/squid-tlv.cc b/tools/purge/squid-tlv.cc index c2b1b65ac8..22ecafa05e 100644 --- a/tools/purge/squid-tlv.cc +++ b/tools/purge/squid-tlv.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/purge/squid-tlv.hh b/tools/purge/squid-tlv.hh index 84df518c2b..a1065ee2a4 100644 --- a/tools/purge/squid-tlv.hh +++ b/tools/purge/squid-tlv.hh @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/squidclient/Makefile.am b/tools/squidclient/Makefile.am index e5f50a096a..575bee62f6 100644 --- a/tools/squidclient/Makefile.am +++ b/tools/squidclient/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/squidclient/Parameters.h b/tools/squidclient/Parameters.h index 65205bd03e..2cdef47e6b 100644 --- a/tools/squidclient/Parameters.h +++ b/tools/squidclient/Parameters.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/squidclient/Ping.cc b/tools/squidclient/Ping.cc index 3a01900200..23037ffeed 100644 --- a/tools/squidclient/Ping.cc +++ b/tools/squidclient/Ping.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/squidclient/Ping.h b/tools/squidclient/Ping.h index 64b73e50eb..ac06a9be06 100644 --- a/tools/squidclient/Ping.h +++ b/tools/squidclient/Ping.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/squidclient/Transport.cc b/tools/squidclient/Transport.cc index 4bc7a9f4fe..3ac0826863 100644 --- a/tools/squidclient/Transport.cc +++ b/tools/squidclient/Transport.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/squidclient/Transport.h b/tools/squidclient/Transport.h index 1f529701c5..b83ed7f20d 100644 --- a/tools/squidclient/Transport.h +++ b/tools/squidclient/Transport.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/squidclient/gssapi_support.cc b/tools/squidclient/gssapi_support.cc index a2033f1792..d9d29ceee2 100644 --- a/tools/squidclient/gssapi_support.cc +++ b/tools/squidclient/gssapi_support.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/squidclient/gssapi_support.h b/tools/squidclient/gssapi_support.h index de03256941..cc8f20450c 100644 --- a/tools/squidclient/gssapi_support.h +++ b/tools/squidclient/gssapi_support.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/squidclient/squidclient.1 b/tools/squidclient/squidclient.1 index df6ecbefa0..8db217916d 100644 --- a/tools/squidclient/squidclient.1 +++ b/tools/squidclient/squidclient.1 @@ -236,7 +236,7 @@ numerous individuals from the internet community. . .SH COPYRIGHT .PP - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/squidclient/squidclient.cc b/tools/squidclient/squidclient.cc index 2aac75a667..1eb6568f4c 100644 --- a/tools/squidclient/squidclient.cc +++ b/tools/squidclient/squidclient.cc @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2021 The Squid Software Foundation and contributors + * Copyright (C) 1996-2022 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/tools/systemd/Makefile.am b/tools/systemd/Makefile.am index 6df36d351f..07d07c1916 100644 --- a/tools/systemd/Makefile.am +++ b/tools/systemd/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/systemd/squid.service b/tools/systemd/squid.service index 34f7288c1a..467a640727 100644 --- a/tools/systemd/squid.service +++ b/tools/systemd/squid.service @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/sysvinit/Makefile.am b/tools/sysvinit/Makefile.am index 9b7f80cb85..f3a2491f65 100644 --- a/tools/sysvinit/Makefile.am +++ b/tools/sysvinit/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations. diff --git a/tools/sysvinit/squid.rc b/tools/sysvinit/squid.rc index 59ab59becd..71905f04ba 100644 --- a/tools/sysvinit/squid.rc +++ b/tools/sysvinit/squid.rc @@ -1,6 +1,6 @@ #!/bin/sh # -## Copyright (C) 1996-2021 The Squid Software Foundation and contributors +## Copyright (C) 1996-2022 The Squid Software Foundation and contributors ## ## Squid software is distributed under GPLv2+ license and includes ## contributions from numerous individuals and organizations.