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 e6364d69b82aa3e58a956279eeada1f1af3d8c35..ce3e3a63b1104d9b9639fd703610d9aa0159fd78 100644 (file)
--- 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 6486941528763f0c069e3334dd4f6b3032de142c..78e72d6d83a3d8c6cb597e09cbd85e97e8caa532 100644 (file)
--- 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 992c2948ad28797e37a1e78ce25f649a08d35706..f2070b550190f080dfb2c27411e963df8f47edf4 100644 (file)
--- 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 dadcd72a05a7aa05233e1673fad6c09c2d607ff3..227b40827d353804fe3c55c59ceb488f8a0efcfa 100644 (file)
--- 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 289b49f53f01a6b9a99f26d265f747f7fa9a3629..4afc87aaf3e0a0e5cd2920df79cfedc9ff407d18 100644 (file)
--- 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 cd5ced7dadd54b1b2259f2cec99c874bce794ef6..bc65be902380011c0608653e1a6f3cceb3e475c5 100644 (file)
--- 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 292b2b61420d3ce4d7b8bd85e1977be67548606c..004845b228665f8f1e97c3f9bd899c95540a02e0 100644 (file)
--- 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 3b2331e58f9ba5a7483a71ac3e480eb03a69503d..fa211bda05273f81e0220d701bd45ebf996b5186 100644 (file)
--- 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 97b26f42fc05fa19ad7cd9a873b7a9b94c376c97..5433d7a511bd0448591dae56f171842f2d4f4769 100644 (file)
--- 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 6db2c6d69b82a580775689a756f57f5e2fc5caa7..7aa93abd8515322d38771394ccd7a084a776f712 100644 (file)
--- 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 b614810fd7344c81297d8db816e992960f9aa8db..a1015ad063d7691bb08781fb2711f834d9489e14 100644 (file)
--- 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 3b2e702c6c9fdb161a1129668c37707fda52b6fd..1887fc2ee7b88d834f2e77eb644824f9a143688c 100644 (file)
--- 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 65386974286ff928d80528a48133a4cc8ca0633f..817cd0e69bf08f6b8e69a355fb248fc1333d544d 100644 (file)
--- 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 8f1dd783b488728eae48c5008ce3e4230168515f..8e8c15f4526135d40af0fba992356033bd6c81e6 100644 (file)
--- 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 8212ed601b34e58430558ab4d1c32926420071e3..6771a9107d385673f3896a0ce4b35c4c3bb151d3 100644 (file)
--- 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 5baef61c4aa9f55ac28f40f1d6c61e3f7949ce68..545353363c4b03d352c6ec8792b570dd8a5130e7 100644 (file)
--- 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 103886b720e8d8296cfb642484b0a6054f42358c..abe2e51ca6d0d4b80c3e290d3cd2f87719edb257 100755 (executable)
--- 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 344da3ad631236fedc62e3038de5be8bee63cb63..842d3cc5f46c8125232c6c96a755639156ba27a5 100644 (file)
--- 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 474f79785e0fb552d04a70986df5ffc8d571cc57..14482b94b6806c9c30539c1aa48f261940e3f932 100644 (file)
--- 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 eb0c53960bfde4492dbe2d3275ed7c0953a18724..66d5ed373f7c8a07f36541882b29754403b0c7cb 100644 (file)
--- 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 8db8b06daaa7228970b4a8641a966da44e65229b..82fcb6102241ac5c93249436c176dcfc8eaab59a 100644 (file)
--- 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 0c436be857937c068574a3fd1eafe035702922dc..2f04a4da93559d72618f850d5018477c27a7d31b 100644 (file)
--- 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 9d0bdb12ccfcdd607c5f8b8c68eaeb8b78366d42..ee6c167edb1f1b8d02764d91351b5999ac91b826 100644 (file)
--- 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 e145950d6ae6096d6869a0240a7a87a38da585fa..d3d5e845fc6941abe95cdf4fb960c2755cf33b47 100644 (file)
--- 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 5563defd0f5c4bc2d3770e06214c714af3a1f357..540db47c8933c8a5928162f3c8c86be36d6aed19 100644 (file)
--- 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 59cbe7a3b8c1fde00e24f509492513f08b32277f..3c1f12c6f0ee0fe08c96a47ff48325025ce158b3 100644 (file)
--- 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 d59c76d4309ac610d6a38a9c19f4097c6eabcb4a..db06cfd7284bdeaea613655212c5deb5a4f8c944 100644 (file)
--- 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 7def522c47c87804899e33b0a466c5482373be9a..aee99328e7836fff10ae31ff1473eca188e4eaca 100644 (file)
--- 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 730d8079f09c260ab2dd7938ef8b6168f51d236e..32dfd98dc6b0ac45f7293385efa7f77b9b138db5 100644 (file)
--- 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 a3133725414c2ce31d73015aafc89adbf1ed1178..564b5e7ef9798b80e632205346c7e8bb4eb6d067 100644 (file)
--- 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 139b41fdf8c1f466bee8c6cbddf8312878938e9e..66beb0f5cbf3ceb538bcd64fccdf041cd49839ab 100644 (file)
--- 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 b9243436db594127aaa2e357598f6b8980b898e8..5487185f131846dd10e7f741511bbc60af5efaba 100644 (file)
--- 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 ad79445837d7447df14ad2eba1a68534a4fca7ca..b6222829f85623321fbfc94826bfad1e51ed4b10 100644 (file)
--- 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 b7b315a4a7d716ccdbb9fb050448746491fb35ce..03a79e23241fadd9cf97fc5cc74caefb5c71e13b 100644 (file)
--- 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 8a38cf53a51217d3285b3f2346f7f8f8296f25c1..eaa8998ae4d4f117e7b9f91701dfcafc1aac92b3 100644 (file)
--- 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 9744844944af5a8b8189e387c82fe9cb85bc329d..d27042f491015c86f6054ffd2633dad6e9221f6a 100644 (file)
--- 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 7a458de8989eb4e8ca491c1fcf7a8c648d3d6ebc..a3c8f5ff57c042b557e8b0ad5638180067567217 100644 (file)
--- 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 ba54b197bebc7b0301c01a08389bd0015a9d4bc8..6fa077b25fe7d5ccdea47e6f9cce2d23a57a1b91 100644 (file)
--- 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 62b260665af14924d910efe365f22d78da2fb420..5ff864c86b3eda416dcdc67dee49ddd4cddafb12 100644 (file)
--- 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 9d00b2de2246f6f68a8be1ca2b50afa1e05f5ea0..2ff5cb04c9b407ce3c00fdcce41a8fa270eb0efa 100644 (file)
--- 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 cbcd1e11744b29b96dadb67a9f622363de42d7d6..2ec56d7173ee09c51f0cb849e62853afd63c257f 100644 (file)
--- 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 82486f37fb85ac5d8d92f9a5649d41769629456c..f81f9a2038eff009ea2ef887c4e4af2fcacc9e65 100644 (file)
--- 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 60a010d806d09d97bf10b5a19fe9537aa854d04b..5c8e29f24a639290f581b471d7ac92e673627150 100644 (file)
--- 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 2da98951ab185f29dbb22b6bc815162c8bf52849..61c4a5f17640729bb47373b4fcf87cc26392e2c5 100644 (file)
--- 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 8b5d320057316c3e25faeb52cb339c26b3eda1a9..f2e297f0c1d4057fe72020b291fcf08ed05b8e1d 100644 (file)
--- 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 7c99ec6933538119710a31c45cbdfffd9df32d56..3ac22dab261b7fafef93d8d588a7c7de275bf175 100644 (file)
--- 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 cf5b53b375750016c623719c06573b9411b60b97..fa0ec3fcd646fcc064a76892f21dd8183ba64b35 100644 (file)
--- 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 615919f539dad071549c0b9f2a54fa0de0adf369..cd3145714fd77a853d298cae48224196f3a13786 100644 (file)
--- 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 d1be71d9a6f68a83ef3c57de828cfd0e975cb512..b6afd67a9922e248f8f5ac1655cf92927eea4cc9 100644 (file)
--- 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 e750f47d7b9dbbd08b964f339b0a5ef2d89ff05a..8730193610d355da8ebce8ab9adcb4e209cb65c9 100644 (file)
--- 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 dff2a2b14a05b45398a1202df670ffe4a488195e..f0abf81c09bd73965202c80803645e912eb2716d 100644 (file)
--- 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 a62f8b39b0bc9b757b81c4894e027005a8a69d8c..30d8bf10150c23d1dfe9e1ed4976cb50538a7962 100644 (file)
--- 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 af384a2372b611da56cdcc2bf8d0fae1e4515432..c28570ed04ec991b9b6cdce28bf890fbdc991e56 100644 (file)
--- 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 3058e34c7362502145456b5333644b1383e8eb1e..6a36fe604d7561c4faa765965f8a9d2441aaa45b 100644 (file)
--- 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 9908df0b74e1f184a5b5800b4a036331944bbe1b..b35d83c3aacb38b4dfcd0b862edb1f5ccf3e3dfa 100644 (file)
--- 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 56a41267903ef275807a335e7f941f16b397ed51..a819767d5f2ee23243bdd4a6a0acc2cb62ba71ee 100644 (file)
--- 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 d356ae9b5e5973a72835a0a9ad428b1de05e0145..54e61850b4fc166b2c076810298400f1a24ce6d4 100644 (file)
--- 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 aaabf97b1e53c0b4bc8f914030b0b1d6ec302aa3..7d0f06d59d8b4332805f1cdaa6bd8875583b46f6 100644 (file)
--- 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 f01c8c90ae6a2b5045b7f5b288d352cecf67df27..dc491e2eaf37b5a870cc4c88c1a053c9d369dd0a 100644 (file)
--- 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 65630a0c097e803e8c056e63cb9f426bdc441a65..c7a4e471a1feae755627b8f02f5eabbac9ec4153 100644 (file)
--- 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 358b3777b7d1987fc0e71c3c17cf55a8528169d3..f10ae651cc3ae25080a3e1448ae570ed3811c076 100644 (file)
--- 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 7b1d0a375ec4d195e0f2599ff98569e4dd316cf9..3fb7d266923a8445fceb84e5ba5e6162c8e57d05 100644 (file)
--- 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 951606edbcbf9403cc6b63654084148cf5dc3d35..7fdd6ba9916b4b5a52aa4ca1add7d00855842564 100644 (file)
--- 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 c558da2b0ee0f9ddb0cfa54645121bd3ef0069f7..c3a3689675ede74bb4d8a04d31f9826b4eb28413 100644 (file)
--- 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 17f8aa9675a877a10eb2ad6db152c3a5bf8710d7..92868c9d2dd8f0c42d7218c180c7d2fbe6504540 100644 (file)
--- 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 f9c23fea122936f79d742d4f5c7bfbe57af12963..4789c28deb1726e9149d0adb593d9c1ac0546cd0 100644 (file)
--- 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 6100ee5490b8e2829a34ae0c6c060a05d0359098..84ad4629eeeb6b8ea26d43efbd91d20d0d057371 100644 (file)
--- 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 3a8b1ba78fe1c862c26acd3d69676bfb6481d061..186939967d2a0aa3adf3d909b44cec7f42f5c201 100644 (file)
--- 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 6c3f33308a8e519790366131d26d145b0723b94a..10b89ded7d27d05f9e39f691c2ab75eff3f2b65e 100644 (file)
--- 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 634e82f1ce130843641c323df078ad33a15191e5..5cad7691741c4df5bbd144c24fab2060479e48b6 100644 (file)
--- 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 79d63ca35c946c81d50730b4748700d6b9f971a5..3129f62da5a04e05d26aeb6dc483bb992f41f9ed 100644 (file)
--- 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 5d471526aa54e8748619339dc982c35a2aef1b33..5c381c90a85f04788b891d783b55cfa279cfc73d 100644 (file)
--- 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 e4fa79037cc34563d6ca7f284c5a8fac45f19e76..2ab02ffbaf020b7428b54798f03861a9f4452bdd 100644 (file)
--- 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 f4b7e854d3442c20a2ccc8049943c62b923eb9b4..1086ae6f6cc6699de83179f633aa79598a13dc95 100644 (file)
--- 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 c14e85ce3540a2d87e3e294216cd0dbfab0fbe8d..c30c3d668b6713e42e29eef2283492ff39cf9f3d 100644 (file)
--- 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 7cd8879af277ea60523132ce74b7d9c04bb632ea..666a51785c3f4a0294c348140514c631e3909550 100644 (file)
--- 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 b8397b700f52728b461661b676cd6c5258ee853a..fee92c0448dca925d45d8f2b6d4b1dfab773d3c5 100644 (file)
--- 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 fe3467adb08779c4d04de7d6ee64de2220eff082..15697ec0eb226c573c33cb53c130ca600d24451f 100644 (file)
--- 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 88f2dc54b6d2f49d90c798ff4818955b8bc5c04e..fa4a62d39d6760dce8b177504096b0a58afe9190 100644 (file)
--- 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 38d3443581056a1594b0114f7bbfa73b9c88eb49..99c6b4c59eb49b05fcd072bccdd27fdd9b29c06f 100644 (file)
--- 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 5e686fac4997d69218e17d521e7600a8cda7067f..a56ee8d75956bd13c66728a176f3aba207898096 100644 (file)
--- 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 a99232cfd4cc23b6bf3c7d5dbb6aae0cdbb2ce67..04f7501e7d6907644e76f1bcccce4895cd6e8f66 100644 (file)
--- 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 3b972608e3f872e00530327b5ed22d9da412f5c2..05960b9a497c4218c73867b6e6605e0c15f4c758 100644 (file)
--- 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 4c8a654f883657f41bba86ccf2cdc6ad3f3c6a3f..360069d54b1f0d036e656d47f664d3e098843927 100644 (file)
--- 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 0d0e6be7420c952663e26210df53aeb8d697d31e..a28c25eb2f7b1c2b7b7766d69b2aa2220c5a26ba 100644 (file)
--- 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 e94caaf4c3ef0a924dfdc2686822985147c3befb..b2f087cd613893d1cb24ed6d5685ea17aa0fd50b 100644 (file)
--- 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 0601d7c6858a9bad0577e6f03b2a8a59103568fa..acd3f5293a447ec4318626f199610f0f63f45851 100644 (file)
--- 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 8a6c945748692ae9ae380171bcbb5e2a9924153c..0ab664b14884f97d9d0d8c80f1f2afcc0f9df52a 100644 (file)
--- 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 f32448f9aefb7b53cc6b92efdab89f9b2892c027..0b2f315cd4c6a23a965021c96ebeaf6a2627cae9 100644 (file)
--- 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 79fa54400d0852a7f0abefc1540b544779d3d89e..8eedefa7cf15ff69ada05a3f1888250f0eabfd48 100644 (file)
--- 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 df4cf9bd33c78ed696faf9260375b128e843f516..75295573da29c51de8e21f9c0220c04c2e15b730 100644 (file)
--- 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 09466c24b71acc1ba2dcbd8cc20e29d4ebb63317..decdd829e971e2e3e46e3c45309ad6ffebe6bc59 100644 (file)
--- 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 52cde34b52e4978fc7fe95992e3602c8d84795f5..d6b8a6e4e2ed6f80ad16132c35dcc6acf208c08b 100644 (file)
--- 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 1e44619ea62439f9a929752ca058c5e837bbac02..ca8c0d3f28ea3ce79bbcf724a3e3325901750e36 100644 (file)
--- 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 7b269383c14befccc6d92282a136e62162c1e977..f45b60018abcdf8f5797679484b60aa8136f020f 100644 (file)
--- 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 d8848d46ca267368c4f4c56e35e000837c142054..1d39432cb069dbc41c06e934b7704a43e9595c7a 100644 (file)
--- 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 0ccc04ded6b8561660632ad085e47f2f9bc10748..f9aa240461ac4a8fb5137d215aec3e946b2dd16c 100644 (file)
--- 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 b0f5c0cde09cf4c64a2a80848c4a4bf3cf6faa9a..2a10205ed5d304944c14f251723446918dae8d01 100755 (executable)
--- 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 1202a4fdfe85d136dac3a64b663988a75abb201e..d5d4f4a261a4e2263310ae6a285d6dc5903d2e62 100755 (executable)
--- 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 39970a958f4617d6e86ddee24db6ff0c559f673b..0a88f1adbfcc8fbb0c3ffaf4403464f8dfa3ad73 100644 (file)
--- 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 4a14502a791dd1e650d9d08b2e9b4c4e2f61355b..b605eabb2223e431f51a99170ea126c25e910a6c 100644 (file)
--- 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 b28b4c3128668f5647c9f4f4c3f28fd30744211e..f5c567684fd2caf1d5e69cdd01f6a73562557f45 100644 (file)
--- 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 7f94269dc8fd760c3655bca3334a1e13459d7dbc..0f987c6560e7ae2c011f6c73ac2cb6426363e444 100644 (file)
--- 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 d178c85db2f317117c48f084ef1baf401be236d6..3525baeb61f3482e9c8f1204f3b35f69478be311 100644 (file)
--- 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 4ff600ca8290085bb14d9813c2e4f4069417647a..20f387b0e33378cfd307d3d78ff9a544efacf088 100644 (file)
--- 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 5b0439e9e43691fa53a40bd93b929c90ad5dfdea..e2eede9656604ab2c994fb4a4269d7e224a7db76 100644 (file)
--- 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 a9cee3d084a8707da9bb3bcf487107904082b01a..9a0e0068cf3200207c57c85c4e71b835af2c6235 100644 (file)
--- 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 2e23637d0fc63bcb18a04bf7b1bc70dc5d90a096..3cc8d59047ff56c67f18a51328fa84b090941ecd 100644 (file)
--- 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 52e0141d5cf33f8f2e3fc9fb7d81ceb18042053f..c11a50a512d0fa9e296d5050d04abc33db5d58c3 100644 (file)
--- 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 d06b303c7b4f37a24d33a52e261007b7310ed01b..9e780108c217544780b85566720eda85bef07a47 100644 (file)
--- a/doc/Programming-Guide/doxygen.footer.dyn
+++ b/doc/Programming-Guide/doxygen.footer.dyn
@@ -1,6 +1,6 @@
 </div>
 <!--
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 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.html b/doc/Programming-Guide/doxygen.footer.html
index 5aed3b20d1f828927fec1229261045be58d70592..99e2b67414918e0fb83f43e1b933db3938999944 100644 (file)
--- a/doc/Programming-Guide/doxygen.footer.html
+++ b/doc/Programming-Guide/doxygen.footer.html
@@ -1,7 +1,7 @@
 <hr size="1"><address style="text-align: right;"><small>
 Generated on $datetime for $projectname by&nbsp;<a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion</small></address>
 <small>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <br>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/doc/Programming-Guide/doxygen.header.dyn b/doc/Programming-Guide/doxygen.header.dyn
index ba696009ad4a72975ca5f854003a601ba1099302..19f6747daeb4c6a223e5967926977bc6b7c40875 100644 (file)
--- a/doc/Programming-Guide/doxygen.header.dyn
+++ b/doc/Programming-Guide/doxygen.header.dyn
@@ -1,5 +1,5 @@
 <!--
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 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.header.html b/doc/Programming-Guide/doxygen.header.html
index 7d731d38bf504a0e73b0dfa36062c5f9399473ea..41255032675833c24e2855cff573f195410603b5 100644 (file)
--- a/doc/Programming-Guide/doxygen.header.html
+++ b/doc/Programming-Guide/doxygen.header.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head>
 <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<meta name="dcterms.rights" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta name="dcterms.rights" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <title>Squid3 Programmers Guide - $title</title>
 <link href="$relpath$doxygen.css" rel="stylesheet" type="text/css">
 <link href="$relpath$tabs.css" rel="stylesheet" type="text/css">

diff --git a/doc/debug-messages.dox b/doc/debug-messages.dox
index d1d09f8290c2ff240527ecf60c0338063cccb07f..c5c9e1cc8fe0bbbfb9b220461108787f05787114 100644 (file)
--- a/doc/debug-messages.dox
+++ b/doc/debug-messages.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.
@@ -56,7 +56,7 @@ ID Message gist
 46 Finished rebuilding storage from disk. ... Entries scanned ... Invalid entries ... With invalid flags ... Objects loaded ... Objects expired ... Objects canceled ... Duplicate URLs purged ... Swapfile clashes avoided ...Took ... seconds ( ... objects/sec).
 56 Beginning Validation Procedure
 57 Indexing cache entries: ...
-58 ALE missing ...
+58 ERROR: ALE missing ...
 59 Shutdown: Digest authentication.
 60 Shutdown: Negotiate authentication.
 61 Shutdown: NTLM authentication.

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index c3f48fb4896b49b732003c788913e72a460407e7..4e3a879327a1bbe156c537dfb2dd6134b3d636ab 100644 (file)
--- a/doc/debug-sections.txt
+++ b/doc/debug-sections.txt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -7,7 +7,6 @@
  */
 
 
-section 00    Announcement Server
 section 00    Client Database
 section 00    Debug Routines
 section 00    Hash Tables
@@ -24,6 +23,7 @@ section 05    Disk I/O pipe manager
 section 05    Listener Socket Handler
 section 05    Socket Connection Opener
 section 05    Socket Functions
+section 05    TCP Socket Functions
 section 06    Disk I/O Routines
 section 07    Multicast
 section 08    Swap File Bitmap
@@ -113,6 +113,7 @@ section 61    Redirector
 section 64    HTTP Range Header
 section 65    HTTP Cache Control Header
 section 66    HTTP Header Tools
+section 67    String
 section 68    HTTP Content-Range Header
 section 70    Cache Digest
 section 71    Store Digest Manager
@@ -130,7 +131,6 @@ section 79    Squid-side Disk I/O functions.
 section 79    Storage Manager UFS Interface
 section 80    WCCP Support
 section 81    aio_xxx() POSIX emulation on Windows
-section 81    CPU Profiling Routines
 section 81    Store HEAP Removal Policies
 section 82    External ACL
 section 83    SSL accelerator support

diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index c55e9cadce926849803b7c1c6e13f4c4c4e7ce52..4c1a3e454d52bb55af0ee9475fe780ffac392cd1 100644 (file)
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/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/manuals/Substitute.am b/doc/manuals/Substitute.am
index e6299f247d8bee9ba01cd45e9e80c667a769c6d8..1ace0baaae07d5933c91e926218ba7bcb4a45867 100644 (file)
--- a/doc/manuals/Substitute.am
+++ b/doc/manuals/Substitute.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/manuals/language.am b/doc/manuals/language.am
index b86db50a8b072194bbd3852c1480871c3b93320b..3fd97ca555be9904871016120795953cd16b6c81 100644 (file)
--- a/doc/manuals/language.am
+++ b/doc/manuals/language.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.

diff --git a/doc/release-notes/Makefile.am b/doc/release-notes/Makefile.am
index 977b9a9d9e52ca7b1be72cc7a1c185b260042bb8..ae5601aa2c0391448b0c80187e8ed12694c5bfc0 100644 (file)
--- a/doc/release-notes/Makefile.am
+++ b/doc/release-notes/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/release-notes/release-3.0.sgml b/doc/release-notes/release-3.0.sgml
index 73e457e5f4760d60a4b41c1b3aa636e7a9f8af81..89919d2e14519a9ba77b0d46cd7edb08f291f8cd 100644 (file)
--- a/doc/release-notes/release-3.0.sgml
+++ b/doc/release-notes/release-3.0.sgml
@@ -1082,7 +1082,7 @@ See the accf_http(9) man page.
 
 <sect>Copyright
 <p>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <p>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index 9c8f9adf83ab35269e941f03d5a6d4a3602421b4..ed468d7f460909b6d0019af6d66eda82e820393b 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -1779,7 +1779,7 @@ This section gives an account of those changes in three categories:
 
 <sect>Copyright
 <p>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <p>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml
index 915fc14c50a35462b93eba12932fb95916609ecd..13fc0fca1f3e8a11e54c168d9e0fbaa3b67783c2 100644 (file)
--- a/doc/release-notes/release-3.2.sgml
+++ b/doc/release-notes/release-3.2.sgml
@@ -1124,7 +1124,7 @@ This section gives an account of those changes in three categories:
 
 <sect>Copyright
 <p>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <p>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/doc/release-notes/release-3.3.sgml b/doc/release-notes/release-3.3.sgml
index 8462fbc893396fc0dc810add763e703209ece9b4..092ee33e7b57a20f372673c5ab16cf4794b489d0 100644 (file)
--- a/doc/release-notes/release-3.3.sgml
+++ b/doc/release-notes/release-3.3.sgml
@@ -363,7 +363,7 @@ This section gives an account of those changes in three categories:
 
 <sect>Copyright
 <p>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <p>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/doc/release-notes/release-3.4.sgml b/doc/release-notes/release-3.4.sgml
index a89b98475ffdcdd25dd5412ec9493f2e2a5be3b2..3e082bedfedd78d9c501e9563ab4f41fed59e61e 100644 (file)
--- a/doc/release-notes/release-3.4.sgml
+++ b/doc/release-notes/release-3.4.sgml
@@ -501,7 +501,7 @@ This section gives an account of those changes in three categories:
 
 <sect>Copyright
 <p>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <p>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index 14e217a46ff776838e62769a607fdd6a63d10460..5e6d1cc02ad280eb3cb44c164bbb61ff74a6c362 100644 (file)
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -683,7 +683,7 @@ This section gives an account of those changes in three categories:
 
 <sect>Copyright
 <p>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <p>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index 74018725b4a6dbb26ca2032aa2ad697aaa911776..5fc4030df18c45c2c7ab6fd6b8fe8e6bea782e23 100644 (file)
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -641,7 +641,7 @@ This section gives an account of those changes in three categories:
 
 <sect>Copyright
 <p>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <p>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/doc/release-notes/release-5.sgml b/doc/release-notes/release-5.sgml
index 493508fef2de425a34b78a24d038264699df2774..f98665af50c9d5d5181247abf58699c6b48b1290 100644 (file)
--- a/doc/release-notes/release-5.sgml
+++ b/doc/release-notes/release-5.sgml
@@ -404,7 +404,7 @@ This section gives an account of those changes in three categories:
 
 <sect>Copyright
 <p>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <p>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/doc/release-notes/release-6.sgml b/doc/release-notes/release-6.sgml
index 25b1bd2a4708ac41e9433969217f807df453d88b..f132488879d43c0ba21b7916f08ead7084c87599 100644 (file)
--- a/doc/release-notes/release-6.sgml
+++ b/doc/release-notes/release-6.sgml
@@ -180,7 +180,7 @@ This section gives an account of those changes in three categories:
 
 <sect>Copyright
 <p>
-Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 <p>
 Squid software is distributed under GPLv2+ license and includes
 contributions from numerous individuals and organizations.

diff --git a/errors/COPYRIGHT b/errors/COPYRIGHT
index 5b67645267b108e1cdf6322ccd55b918e009cf49..42c3ff926a6f168554d891deef6f270d5537473a 100644 (file)
--- a/errors/COPYRIGHT
+++ b/errors/COPYRIGHT
@@ -1,6 +1,6 @@
 ==============================================================================
 
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/errors/Makefile.am b/errors/Makefile.am
index d1455e44cc61a5eab4a3f8ddfa6b3c43216c959b..e19c320e1a153e43382810cd7f5b7306c3c10d39 100644 (file)
--- a/errors/Makefile.am
+++ b/errors/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/errors/TRANSLATORS b/errors/TRANSLATORS
index 7cd4bfa681c3649e46faac7a362a0c5a0c505bfb..96bad1fc0a29aa2b0af33b301284c04db04a9e7d 100644 (file)
--- a/errors/TRANSLATORS
+++ b/errors/TRANSLATORS
@@ -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/errors/alias-link.sh b/errors/alias-link.sh
index 2e61e193357284cdcd3a9a87354f930d740c1c33..804d97fabd0db91a1bf7ee47b2dae53d2d461ae8 100755 (executable)
--- a/errors/alias-link.sh
+++ b/errors/alias-link.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/errors/alias-upgrade b/errors/alias-upgrade
index 9a91f7f11b93a2cb531f162f3217b25bc40b8381..49042d7a19d9ab1aec176398c3f73f1bb75d198d 100644 (file)
--- a/errors/alias-upgrade
+++ b/errors/alias-upgrade
@@ -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/errors/aliases b/errors/aliases
index e15099b563dd8021b1e500a05e06435f32706997..e324ea8e0f7fc448479e668ae4f905044847803f 100644 (file)
--- a/errors/aliases
+++ b/errors/aliases
@@ -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/errors/errorpage.css b/errors/errorpage.css
index 38ba43415391c70a200539469ba6ee89e72243eb..5e4fd4750cbd7eccab0d392f914da3db295eb307 100644 (file)
--- a/errors/errorpage.css
+++ b/errors/errorpage.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/errors/language.am b/errors/language.am
index f9053a89db581fb828ae6bacd9f206e19595a1f2..c3a610697e2424adab9d62d853258f6f71173a02 100644 (file)
--- a/errors/language.am
+++ b/errors/language.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.

diff --git a/errors/template.am b/errors/template.am
index 5cfc2f8835f2781968014473fb8dcba1035e28fd..3147a981bbd1e651ccdc79cdf053b736f5925af4 100644 (file)
--- a/errors/template.am
+++ b/errors/template.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.

diff --git a/errors/templates/ERR_ACCESS_DENIED b/errors/templates/ERR_ACCESS_DENIED
index c2d8f349f63af3fed5b64567264dc748dbeaf677..675ed5b805c74bee4385f5774fad7591b69732f5 100644 (file)
--- a/errors/templates/ERR_ACCESS_DENIED
+++ b/errors/templates/ERR_ACCESS_DENIED
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!--

diff --git a/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED b/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED
index 815aedda2ab97cfdfb3af1a54378af47aa7847ee..b1665a2534a8d98f1347e42c17270e72fb34ab80 100644 (file)
--- a/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED
+++ b/errors/templates/ERR_ACL_TIME_QUOTA_EXCEEDED
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_AGENT_CONFIGURE b/errors/templates/ERR_AGENT_CONFIGURE
index a144f4b889749d38928ed5b340bbcabc310c2d8c..9faf712226b95e3d1d871965498ef0721ad11891 100644 (file)
--- a/errors/templates/ERR_AGENT_CONFIGURE
+++ b/errors/templates/ERR_AGENT_CONFIGURE
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Web Browser Configuration</title>
 <style type="text/css"><!--

diff --git a/errors/templates/ERR_AGENT_WPAD b/errors/templates/ERR_AGENT_WPAD
index 3fe8763f712662e1fd1d6f8b15e9b43914a261d0..7abaac7c69de5a756b0f4478a6d324d80f8ce150 100644 (file)
--- a/errors/templates/ERR_AGENT_WPAD
+++ b/errors/templates/ERR_AGENT_WPAD
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Web Browser Configuration</title>
 <style type="text/css"><!--

diff --git a/errors/templates/ERR_CACHE_ACCESS_DENIED b/errors/templates/ERR_CACHE_ACCESS_DENIED
index 1d61e80411cc8850add58e78e2df0ae31650cd93..57d801fa544fcbbaf0f2035adb154f63eb663e56 100644 (file)
--- a/errors/templates/ERR_CACHE_ACCESS_DENIED
+++ b/errors/templates/ERR_CACHE_ACCESS_DENIED
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: Cache Access Denied</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
index a5d3b761a7629cf08b1693aa1eb8abdf00214cd8..ca03f0f44b98e44e38ec2a5e0bc6e36438255b95 100644 (file)
--- a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
+++ b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: Cache Manager Access Denied</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_CANNOT_FORWARD b/errors/templates/ERR_CANNOT_FORWARD
index bb7fc759503f75ae710388b1cbdadf2560939946..1e5034a4828e20d2970e4eb8fbd486e2c16c8953 100644 (file)
--- a/errors/templates/ERR_CANNOT_FORWARD
+++ b/errors/templates/ERR_CANNOT_FORWARD
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_CONFLICT_HOST b/errors/templates/ERR_CONFLICT_HOST
index 13c933fe784a8cd28abca7f7b4ad13b3358e4519..f9337796d6e21994bb4820e99dab740c36a846c4 100644 (file)
--- a/errors/templates/ERR_CONFLICT_HOST
+++ b/errors/templates/ERR_CONFLICT_HOST
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_CONNECT_FAIL b/errors/templates/ERR_CONNECT_FAIL
index 4d667bbcd6f73b71a2430d74ed2bd65ee72446f7..33b12d0548fdd0e79ab9f0aadf70c72093ca5b4e 100644 (file)
--- a/errors/templates/ERR_CONNECT_FAIL
+++ b/errors/templates/ERR_CONNECT_FAIL
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" CONTENT="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_DIR_LISTING b/errors/templates/ERR_DIR_LISTING
index b06952d2bd189240fa674e801265b97b7c2275f1..89133f59fb686997738689de5f860176b7405052 100644 (file)
--- a/errors/templates/ERR_DIR_LISTING
+++ b/errors/templates/ERR_DIR_LISTING
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Directory: %U</title>
 <style type="text/css"><!--

diff --git a/errors/templates/ERR_DNS_FAIL b/errors/templates/ERR_DNS_FAIL
index e64e4173dfcb2de0c4d8f149b14e7000ced1fa60..c9a2dd32ebebdfdb38287021e840203f9fa5d64b 100644 (file)
--- a/errors/templates/ERR_DNS_FAIL
+++ b/errors/templates/ERR_DNS_FAIL
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_ESI b/errors/templates/ERR_ESI
index aee77e7ec3b349e09824ff07a1b918154b57747d..e06fe515e7d2fd3a48da3041be0e5478d040b29e 100644 (file)
--- a/errors/templates/ERR_ESI
+++ b/errors/templates/ERR_ESI
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_FORWARDING_DENIED b/errors/templates/ERR_FORWARDING_DENIED
index cd3b538802c37af6eb17460ab6a68d0e064da2d8..f0d31b183489f2a1b6ddd2ec11c85bdc05cf21d3 100644 (file)
--- a/errors/templates/ERR_FORWARDING_DENIED
+++ b/errors/templates/ERR_FORWARDING_DENIED
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_FTP_DISABLED b/errors/templates/ERR_FTP_DISABLED
index 25aa89b9db1fa2a4fc25a9b2f0d77e62140cd4b2..487a29f98319eed5c13ec927e3441b4df6915091 100644 (file)
--- a/errors/templates/ERR_FTP_DISABLED
+++ b/errors/templates/ERR_FTP_DISABLED
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_FTP_FAILURE b/errors/templates/ERR_FTP_FAILURE
index 10e44c79ee7e6b25079c84624a1685ebd40d5a2a..32ea36b19c04521635b3ac674ad2d790bd42d20c 100644 (file)
--- a/errors/templates/ERR_FTP_FAILURE
+++ b/errors/templates/ERR_FTP_FAILURE
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_FTP_FORBIDDEN b/errors/templates/ERR_FTP_FORBIDDEN
index 652aeb13e8a7f85d9151ebc327958bf870573c28..6febaf86d3250e2d3f99eac9bcb150afc7112e09 100644 (file)
--- a/errors/templates/ERR_FTP_FORBIDDEN
+++ b/errors/templates/ERR_FTP_FORBIDDEN
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_FTP_NOT_FOUND b/errors/templates/ERR_FTP_NOT_FOUND
index a2211d40563ad10a1db2987a10d29cc4d288e961..11f83379faaf1da7cfb1d466e630fb825d6fe62c 100644 (file)
--- a/errors/templates/ERR_FTP_NOT_FOUND
+++ b/errors/templates/ERR_FTP_NOT_FOUND
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_FTP_PUT_CREATED b/errors/templates/ERR_FTP_PUT_CREATED
index daf41a5203ca5fb67e3689bd59ddb7526536534e..33e17db7d7dfd444b8920145761c656d17030ec1 100644 (file)
--- a/errors/templates/ERR_FTP_PUT_CREATED
+++ b/errors/templates/ERR_FTP_PUT_CREATED
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>FTP PUT Successful.</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_FTP_PUT_ERROR b/errors/templates/ERR_FTP_PUT_ERROR
index 744362324c96c4dc883dbbde97faac9ee89b1ede..83283434110dda1c14fafdf07636ef5161464029 100644 (file)
--- a/errors/templates/ERR_FTP_PUT_ERROR
+++ b/errors/templates/ERR_FTP_PUT_ERROR
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: FTP upload failed</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_FTP_PUT_MODIFIED b/errors/templates/ERR_FTP_PUT_MODIFIED
index 4def03d8979717f9e8b9c2cbc9f8983b8548ded9..4a7be4cea997693616c05b1de833379e01300404 100644 (file)
--- a/errors/templates/ERR_FTP_PUT_MODIFIED
+++ b/errors/templates/ERR_FTP_PUT_MODIFIED
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>FTP PUT Successful.</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_FTP_UNAVAILABLE b/errors/templates/ERR_FTP_UNAVAILABLE
index 32086936a2b6fdc0dee6d3081332e434a867de2e..8657b6d14eba1bfb7af743842e667178538f7873 100644 (file)
--- a/errors/templates/ERR_FTP_UNAVAILABLE
+++ b/errors/templates/ERR_FTP_UNAVAILABLE
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_GATEWAY_FAILURE b/errors/templates/ERR_GATEWAY_FAILURE
index 57f5bd01b85e9710c19e96e787a75d43eef0a851..1c2b3780695f6ad0c3be415f5cfdc0d2d06d6c5c 100644 (file)
--- a/errors/templates/ERR_GATEWAY_FAILURE
+++ b/errors/templates/ERR_GATEWAY_FAILURE
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_ICAP_FAILURE b/errors/templates/ERR_ICAP_FAILURE
index 09666643c9c309cd59698f179da93a7a36841836..e70d0e8acad868e986f90f21715e756d68267a8a 100644 (file)
--- a/errors/templates/ERR_ICAP_FAILURE
+++ b/errors/templates/ERR_ICAP_FAILURE
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_INVALID_REQ b/errors/templates/ERR_INVALID_REQ
index 0d714718bd5e70782d863b0ae1eb36b382754cec..3d176cfdf6afabad0e9a2fb02344be5f6336ddf1 100644 (file)
--- a/errors/templates/ERR_INVALID_REQ
+++ b/errors/templates/ERR_INVALID_REQ
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_INVALID_RESP b/errors/templates/ERR_INVALID_RESP
index 239ae11d8091c64df9cb3ad6436863641295aad0..bd8461a15ab61740ec9b9502f545654e665846c1 100644 (file)
--- a/errors/templates/ERR_INVALID_RESP
+++ b/errors/templates/ERR_INVALID_RESP
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_INVALID_URL b/errors/templates/ERR_INVALID_URL
index 087ec0d7b02c5b722fbc339823aaa6a3176a698c..0493b8d7c657439a0cc64888fa02c367c6eec8e0 100644 (file)
--- a/errors/templates/ERR_INVALID_URL
+++ b/errors/templates/ERR_INVALID_URL
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_LIFETIME_EXP b/errors/templates/ERR_LIFETIME_EXP
index 42d9dcd645dfd1d8c2fde9dc941ef127f76b70b5..ed1b5a732e3a5a1a2b0e2f88f4337bb1f70b1d14 100644 (file)
--- a/errors/templates/ERR_LIFETIME_EXP
+++ b/errors/templates/ERR_LIFETIME_EXP
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_NO_RELAY b/errors/templates/ERR_NO_RELAY
index 4b717ee61d78506668ce077e61510806d30097c0..c6ae592d89afe60163440ee4c99f2f9cc7e88eac 100644 (file)
--- a/errors/templates/ERR_NO_RELAY
+++ b/errors/templates/ERR_NO_RELAY
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_ONLY_IF_CACHED_MISS b/errors/templates/ERR_ONLY_IF_CACHED_MISS
index bbc766ca04a03ecb0857a663c7dea1bec74051b8..45a6cecb68c2989d10fdffcc47b10ba61a2d0c11 100644 (file)
--- a/errors/templates/ERR_ONLY_IF_CACHED_MISS
+++ b/errors/templates/ERR_ONLY_IF_CACHED_MISS
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_PRECONDITION_FAILED b/errors/templates/ERR_PRECONDITION_FAILED
index dc0781c22bb01c669e38aee3f124d5836b59aa01..f506fce1fa2f9f4f5d44f4d09498f6d01a5bd7d1 100644 (file)
--- a/errors/templates/ERR_PRECONDITION_FAILED
+++ b/errors/templates/ERR_PRECONDITION_FAILED
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_PROTOCOL_UNKNOWN b/errors/templates/ERR_PROTOCOL_UNKNOWN
index 17b7b20fab1d9499ddf78aed2d261eb00d8048fa..529fbde0733172baa00e4ddcae35c80e9fc33f49 100644 (file)
--- a/errors/templates/ERR_PROTOCOL_UNKNOWN
+++ b/errors/templates/ERR_PROTOCOL_UNKNOWN
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_READ_ERROR b/errors/templates/ERR_READ_ERROR
index c60a4913a200ccb1317ad499171b6e2b397183f4..c6beece4e40c841e31a03217467fad6bd06812aa 100644 (file)
--- a/errors/templates/ERR_READ_ERROR
+++ b/errors/templates/ERR_READ_ERROR
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_READ_TIMEOUT b/errors/templates/ERR_READ_TIMEOUT
index 07e1cee194f79712bd38bc715aaaa300ba07d941..d8be4a451f06b30ab7184c387cc0a9aeae8a0964 100644 (file)
--- a/errors/templates/ERR_READ_TIMEOUT
+++ b/errors/templates/ERR_READ_TIMEOUT
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_SECURE_CONNECT_FAIL b/errors/templates/ERR_SECURE_CONNECT_FAIL
index ee7d49200acfda92a84cbb9269f35749e9df6482..0308d3f568bfed370565023033da5f1dbc4eb432 100644 (file)
--- a/errors/templates/ERR_SECURE_CONNECT_FAIL
+++ b/errors/templates/ERR_SECURE_CONNECT_FAIL
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_SHUTTING_DOWN b/errors/templates/ERR_SHUTTING_DOWN
index 404ef788158eab9c2b09adca1c7e6d876f093540..1b5c124f3ec8963070a701fabdf6ee660bb62193 100644 (file)
--- a/errors/templates/ERR_SHUTTING_DOWN
+++ b/errors/templates/ERR_SHUTTING_DOWN
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_SOCKET_FAILURE b/errors/templates/ERR_SOCKET_FAILURE
index c8b1da842d9f868882bfb9bfd90520b8f452210b..cd66c94285a5ad6cbf9ffef095af65b143cbd56f 100644 (file)
--- a/errors/templates/ERR_SOCKET_FAILURE
+++ b/errors/templates/ERR_SOCKET_FAILURE
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_TOO_BIG b/errors/templates/ERR_TOO_BIG
index be334b19c31d07a963beaf7330cf76e0057833c0..a72f6b1e0873c6165b1ce60ee24a38029d0aaf5d 100644 (file)
--- a/errors/templates/ERR_TOO_BIG
+++ b/errors/templates/ERR_TOO_BIG
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_UNSUP_HTTPVERSION b/errors/templates/ERR_UNSUP_HTTPVERSION
index 3edfe5060478ffcb8aa9807bd9c470baaa2cb61b..764481ab51c5b9d82b191c61e31bacdfc99d2496 100644 (file)
--- a/errors/templates/ERR_UNSUP_HTTPVERSION
+++ b/errors/templates/ERR_UNSUP_HTTPVERSION
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_UNSUP_REQ b/errors/templates/ERR_UNSUP_REQ
index e880392d984d4ef532e592cc212e024a01545f07..b2310ae2039032964a2fcc9a54a819e1620282fd 100644 (file)
--- a/errors/templates/ERR_UNSUP_REQ
+++ b/errors/templates/ERR_UNSUP_REQ
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_URN_RESOLVE b/errors/templates/ERR_URN_RESOLVE
index 26c37a6fa921ad16f48a29c37e470916e4bc6ef5..14c8b1df8e2ab4c93f160ef632c964d2b03313cb 100644 (file)
--- a/errors/templates/ERR_URN_RESOLVE
+++ b/errors/templates/ERR_URN_RESOLVE
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URN could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_WRITE_ERROR b/errors/templates/ERR_WRITE_ERROR
index 0b87dac05bdd1e48986c951cefcec9122d60698f..0abda5c209da40cb53cfa66fa3e1a2de561be6bd 100644 (file)
--- a/errors/templates/ERR_WRITE_ERROR
+++ b/errors/templates/ERR_WRITE_ERROR
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/ERR_ZERO_SIZE_OBJECT b/errors/templates/ERR_ZERO_SIZE_OBJECT
index 71a17b75699accd140f58a42a8b49796cb3392e7..2601a9a23dbf8535951c06eafbb5ede04533382b 100644 (file)
--- a/errors/templates/ERR_ZERO_SIZE_OBJECT
+++ b/errors/templates/ERR_ZERO_SIZE_OBJECT
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/errors/templates/generic b/errors/templates/generic
index 285c502712c439c257983d62703d86d0ee5fae1c..60ed8043a5166a718cd1ac12c949cc281ee353ed 100644 (file)
--- a/errors/templates/generic
+++ b/errors/templates/generic
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 

diff --git a/icons/Makefile.am b/icons/Makefile.am
index 0d8506005f42d1b6353680013c6ceba354e36ec8..590da3ac35e5f744ec0080b93e368beac0e59ad3 100644 (file)
--- a/icons/Makefile.am
+++ b/icons/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/icons/icon.am b/icons/icon.am
index 37a9158fd79eb994e912919dfc566749f3c29345..c98b07306f189e74cea66d697be19741fb033bf9 100644 (file)
--- a/icons/icon.am
+++ b/icons/icon.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.

diff --git a/include/asn1.h b/include/asn1.h
index 8d32dd1454f874a39e2f6468e2eac31642b3feaf..1bf1048e4a657ee976eec9e7faf26f5323c7d3b2 100644 (file)
--- a/include/asn1.h
+++ b/include/asn1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/base64.h b/include/base64.h
index 5fa0c2c4d5dcb6f3eec61997429f0f18bbbb0ad2..0abf202dcf95a77b024624aea11242641d3e70f1 100644 (file)
--- a/include/base64.h
+++ b/include/base64.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/cache_snmp.h b/include/cache_snmp.h
index 4406d06fd2c5cf9b87a6a701b786b6079baf6bba..a18798c0d17dc97a64a0e8b845f3df60ee6ff425 100644 (file)
--- a/include/cache_snmp.h
+++ b/include/cache_snmp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/getfullhostname.h b/include/getfullhostname.h
index 8f59eb5f3307c6253b6ad81c54e1e0c7b764b097..a189b61360c76c61966730350e8bf581f72e4c1f 100644 (file)
--- a/include/getfullhostname.h
+++ b/include/getfullhostname.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/hash.h b/include/hash.h
index 0b7e2dae773f31bf58e7b1f4eac5755c2bc5b943..2598dc3e80a31175583bdeefa9b28e8607b8d5d5 100644 (file)
--- a/include/hash.h
+++ b/include/hash.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/heap.h b/include/heap.h
index c3bf82a04c25ac15c8769da868c03d0d84376bac..d907e6c5287eb1646fe900cd7390d6095f6d871e 100644 (file)
--- a/include/heap.h
+++ b/include/heap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/html_quote.h b/include/html_quote.h
index f3a7911a3eaf8b393b69d0c68597d4ee357b7097..c30bf6d35ba5924c2ad577b055bed685476430b3 100644 (file)
--- a/include/html_quote.h
+++ b/include/html_quote.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/md5.h b/include/md5.h
index a4273097c191d761afb51003d8be276b09ac107c..92a5a4630f69f55f6538e963e413577136278c97 100644 (file)
--- a/include/md5.h
+++ b/include/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/include/parse.h b/include/parse.h
index fdfd6593b4ece584dac3667df33ef380f6baf9cd..c5671d8dd1f5ed1a4def0941de281cb701b9cf6f 100644 (file)
--- a/include/parse.h
+++ b/include/parse.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/radix.h b/include/radix.h
index fc1a7ef530c3b84a0c423a476f7157514e2a670b..9bbbf20683b5537fcdacc562f8c5ac614cfe3aa7 100644 (file)
--- a/include/radix.h
+++ b/include/radix.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/rfc1123.h b/include/rfc1123.h
index 99f8db22e35d97a481329c10cf9813a02565c278..19e4c293427db4ea6ad8ddaeb0819361e9809c10 100644 (file)
--- a/include/rfc1123.h
+++ b/include/rfc1123.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/rfc1738.h b/include/rfc1738.h
index 195457d4fb8ea10738dfe64c33b409da577aa2dc..8c105ea5cd180d5dfe8a4c4d672d5b1ce07b1640 100644 (file)
--- a/include/rfc1738.h
+++ b/include/rfc1738.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/rfc2181.h b/include/rfc2181.h
index 05154ab631830cbcf4fdfdc16f20420a82517452..6d920c2edceec2db4a6a94d3d221f17555bd0e36 100644 (file)
--- a/include/rfc2181.h
+++ b/include/rfc2181.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/rfc2617.h b/include/rfc2617.h
index 74fddb2c94147477b739009d12bedcdd4538326b..b7e85033d19ac89c460faab9f6349420781b8264 100644 (file)
--- a/include/rfc2617.h
+++ b/include/rfc2617.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/snmp-internal.h b/include/snmp-internal.h
index e81c8fc0b0ba6b2e55058d14093e0cdd3f499c8c..ea348026d63e089b548781e54b0b2727250d1136 100644 (file)
--- a/include/snmp-internal.h
+++ b/include/snmp-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/include/snmp-mib.h b/include/snmp-mib.h
index ea3bb232edeb4a138583caacc76d1f65f7e4c25f..1b4954d7e245c0994dccd841ab9686ade7014baf 100644 (file)
--- a/include/snmp-mib.h
+++ b/include/snmp-mib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/snmp.h b/include/snmp.h
index bda45b2facbaf22d4e2b9bed166ef566d411e749..8428633f439d47038b6b6a1b84100b149a3e733a 100644 (file)
--- a/include/snmp.h
+++ b/include/snmp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/snmp_api.h b/include/snmp_api.h
index 7ab0a2fb4597d9928f7270ce5457b78da59ab645..053cb6f2350d38ef661b7a8e82013f23b802dd3f 100644 (file)
--- a/include/snmp_api.h
+++ b/include/snmp_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/snmp_api_error.h b/include/snmp_api_error.h
index e2230c872b329609d3cacee6511a53e642031941..72bfe3226d4496350efb46da42269682073a8904 100644 (file)
--- a/include/snmp_api_error.h
+++ b/include/snmp_api_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/include/snmp_api_util.h b/include/snmp_api_util.h
index fa3b040bd6431972e1b234cefd62f0578f9db85b..b160011718b35c0c65b89d261cb2fb8477ddc5f6 100644 (file)
--- a/include/snmp_api_util.h
+++ b/include/snmp_api_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/include/snmp_client.h b/include/snmp_client.h
index 2eed680726a5db1e0da1797702ab85ce420da56b..30d3cd3b0f13fd0c93394f6b4c9329d4fbab39d6 100644 (file)
--- a/include/snmp_client.h
+++ b/include/snmp_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/include/snmp_coexist.h b/include/snmp_coexist.h
index 9fdc644e742ddff66afb6b884abc742686fb5579..65c2e0bda3e02ab0eee69530c86783c224cddca8 100644 (file)
--- a/include/snmp_coexist.h
+++ b/include/snmp_coexist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/snmp_debug.h b/include/snmp_debug.h
index ada06efb6aa16c1a4cfdedff3217dfcf60740c2d..55a24cac7ac12075a7f90a63db71bbc5c2e0f86f 100644 (file)
--- a/include/snmp_debug.h
+++ b/include/snmp_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/include/snmp_error.h b/include/snmp_error.h
index 871907f5dd303de9deed1bbc57e869ef8c6d3017..81387fea057215ad23ad3ad6399c4d59680f61d5 100644 (file)
--- a/include/snmp_error.h
+++ b/include/snmp_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/include/snmp_impl.h b/include/snmp_impl.h
index 705b85455cc546b0ed38ea0a9bbf669df2e3deb6..473cbf5ee4c423fb0e970767f9f3942ea5214302 100644 (file)
--- a/include/snmp_impl.h
+++ b/include/snmp_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/snmp_msg.h b/include/snmp_msg.h
index 31282c18f95af45ae7d824c93bd62d0708ffbdeb..70bec09889c7633de6014c2cc78c842b21552364 100644 (file)
--- a/include/snmp_msg.h
+++ b/include/snmp_msg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/snmp_pdu.h b/include/snmp_pdu.h
index 4bb7f55f2d4d32f850444a46a6150f4e09cfff30..9c513eba79f369ad6ba48da697308493ffc74685 100644 (file)
--- a/include/snmp_pdu.h
+++ b/include/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/include/snmp_session.h b/include/snmp_session.h
index 6e077585357a9e600d6c19e15e0797378d280a94..ee3565869a9635392e8e69c51edf79e518c840de 100644 (file)
--- a/include/snmp_session.h
+++ b/include/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/include/snmp_util.h b/include/snmp_util.h
index 3b223c9e33fb8e2eaf92ddb0293df7ae5c83af55..e5b023e2fd88aef778c23404ea4ad510fe66a88f 100644 (file)
--- a/include/snmp_util.h
+++ b/include/snmp_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/include/snmp_vars.h b/include/snmp_vars.h
index 55f102e39d48b983035d2df9bb57f8e6d1c1e361..a66d2991d35589ca0f9cf3f37915d1b23ae8b891 100644 (file)
--- a/include/snmp_vars.h
+++ b/include/snmp_vars.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/splay.h b/include/splay.h
index f44a2b39f8facc9fddfbfd963e2cf002302e17f8..16f04ec2a39c7d1d8b1d0c40efc815e75719ce64 100644 (file)
--- a/include/splay.h
+++ b/include/splay.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/squid.h b/include/squid.h
index e048cbb1b857a42b354b3ffb5680971f4dab0952..6d9a66c05ddd61ff49f7fa8ec1370b88798c04df 100644 (file)
--- a/include/squid.h
+++ b/include/squid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/sspwin32.h b/include/sspwin32.h
index 46e77c9bc1ffc473fa97f5ec52459ffd11c39a05..1efafcffcda8fd524cb3018ee01975b1325a2194 100644 (file)
--- a/include/sspwin32.h
+++ b/include/sspwin32.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/unitTestMain.h b/include/unitTestMain.h
index 24c7127dda03343525243d4721f2465ca4c6a622..7ec716ba14f5cf81f3764b0e24d07d1d0d386790 100644 (file)
--- a/include/unitTestMain.h
+++ b/include/unitTestMain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/util.h b/include/util.h
index 14f9635a936e2a350523fd4ba960ed5d31a91768..af72febcc7bbca6a65634e148b2540b3843c9b86 100644 (file)
--- a/include/util.h
+++ b/include/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/include/version.h b/include/version.h
index c13773832335cb45f5af5a22f8b7f21d367415df..6eb21fe3ce97825cec3a1b416432b7828edb76f2 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/include/xusleep.h b/include/xusleep.h
index 1bd5824cbcbbb31a9c0d6ea78e6266558dd37a97..99de8ac8b4d18f7d8e37d5afaa98124a054a5a09 100644 (file)
--- a/include/xusleep.h
+++ b/include/xusleep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d622354e5ce1a442c812509aec8a84383d1f60c5..b5bc65ef0a9200d6b6f43a605c7a154c73be2440 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/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/lib/Splay.cc b/lib/Splay.cc
index e9ebd183a99d5063cf5c2cb5e3c8124b6aa1800a..e0f9d8f36680340ac11e9d6e0d06be991f71774f 100644 (file)
--- a/lib/Splay.cc
+++ b/lib/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/lib/base64.c b/lib/base64.c
index 3fa002ef7eca2f2019b5c0c0366686e03dd9a934..b4f7dfca6cac44447393a6465b5e87683aeaec12 100644 (file)
--- a/lib/base64.c
+++ b/lib/base64.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/lib/dirent.c b/lib/dirent.c
index 9f99b499405152f5c61ed0ceadd1b63a13ab812f..39bba96880e8be8d30d7ee8f92818164070f20e6 100644 (file)
--- a/lib/dirent.c
+++ b/lib/dirent.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/lib/encrypt.c b/lib/encrypt.c
index 1344069fa77d0c5c54041fe09b391852774e5b9b..771ae691b15b31dfeff33f29bcd35bfb6873b130 100644 (file)
--- a/lib/encrypt.c
+++ b/lib/encrypt.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/lib/getfullhostname.c b/lib/getfullhostname.c
index 5f2d19e14202a3a7caf69df938649d2898e7827c..9bcc90a5b888ec10f98d8a1a29e0c6dcc83dfd78 100644 (file)
--- a/lib/getfullhostname.c
+++ b/lib/getfullhostname.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/lib/getopt.c b/lib/getopt.c
index 463ca3dfd5ef491986c9c6bfab9967e16f555030..241923e960bf272b39a5880875a7d0537514beb5 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.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/lib/hash.cc b/lib/hash.cc
index 4c8e51c45bc72a2b9892ae206b023983f11f93d7..0a16c073e2332129f50e8359f5f77f3f8833c632 100644 (file)
--- a/lib/hash.cc
+++ b/lib/hash.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/heap.c b/lib/heap.c
index d349d2fc5f331e7b63f60773fdf1bfcbb5cb5771..dd52e1bba5dba42107d71a292bf007880232b2f5 100644 (file)
--- a/lib/heap.c
+++ b/lib/heap.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/lib/html_quote.c b/lib/html_quote.c
index 9d839cc50afda4b1ea2c9838841758dada72dc02..f2fe7c983069a2a57ea13362b37ed09fdbe5f0a8 100644 (file)
--- a/lib/html_quote.c
+++ b/lib/html_quote.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/lib/iso3307.c b/lib/iso3307.c
index 7962bea9dca702424a1c324141c1644ddc924f08..8c14e5fe13089eacd093dfdd9e16e8359cd99610 100644 (file)
--- a/lib/iso3307.c
+++ b/lib/iso3307.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/lib/libTrie/Makefile.am b/lib/libTrie/Makefile.am
index c41a76f274e5d4fc7887794728d338383c526c52..bc9d6c1495b26f3cfc973eec2c76cce520266f51 100644 (file)
--- a/lib/libTrie/Makefile.am
+++ b/lib/libTrie/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/lib/libTrie/Trie.cc b/lib/libTrie/Trie.cc
index 2a50ebb4025db871ac08f286bfd2c6a752691266..976ce89ca36b17da27af945234cb43338ce420b7 100644 (file)
--- a/lib/libTrie/Trie.cc
+++ b/lib/libTrie/Trie.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/libTrie/Trie.h b/lib/libTrie/Trie.h
index 8ab3ac22a7c19077d2eeda0c33d31535d866cc01..077c1bf361b52b3a20cf40e77d02a940072e91cc 100644 (file)
--- a/lib/libTrie/Trie.h
+++ b/lib/libTrie/Trie.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/libTrie/TrieCharTransform.h b/lib/libTrie/TrieCharTransform.h
index a111f7105c23a745396a5d9a57ebba0482d47e6d..80085bee58d0b3cd6844f37db77f322a68864626 100644 (file)
--- a/lib/libTrie/TrieCharTransform.h
+++ b/lib/libTrie/TrieCharTransform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/libTrie/TrieNode.cc b/lib/libTrie/TrieNode.cc
index 6f219d3fd7af24a6b38dedd6158fa3be99b3668d..981042cf1d3c8cdfaab32b27fea74cb831e052e6 100644 (file)
--- a/lib/libTrie/TrieNode.cc
+++ b/lib/libTrie/TrieNode.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/libTrie/TrieNode.h b/lib/libTrie/TrieNode.h
index a43c9424e19e37bbc7ee9e5187bfbe484d997260..2904993cea752167fc276fc41653567fa73c1adf 100644 (file)
--- a/lib/libTrie/TrieNode.h
+++ b/lib/libTrie/TrieNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/libTrie/test/Makefile.am b/lib/libTrie/test/Makefile.am
index b8dc9d7c85c6c943b2989bc7d5d8a7496a51923d..834c32917e550e983cc51427276509aba8300fa4 100644 (file)
--- a/lib/libTrie/test/Makefile.am
+++ b/lib/libTrie/test/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/lib/libTrie/test/trie.cc b/lib/libTrie/test/trie.cc
index 5b957df24975c5e75d2ed837a3026558fe25ea09..e89d07182c277f715356d08723b3d7cdca281f6b 100644 (file)
--- a/lib/libTrie/test/trie.cc
+++ b/lib/libTrie/test/trie.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/md5-test.c b/lib/md5-test.c
index cf5b521ecefe065d36d0ebe31d7073c809ce8684..db5d4aaa37eeae6ee24169a08b162eb645337bb8 100644 (file)
--- a/lib/md5-test.c
+++ b/lib/md5-test.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/lib/md5.c b/lib/md5.c
index fd7725e1c6d8bb234f09aa9b4177aff96963fa03..989b4061fccc74ee0a2d4a578a2b32d0b6e67c4e 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.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/lib/ntlmauth/Makefile.am b/lib/ntlmauth/Makefile.am
index f5a977241263751e54040e371e69dd0fa7367ebe..ba784e4645fdc2a79a2858f3a084f3c2897f1c58 100644 (file)
--- a/lib/ntlmauth/Makefile.am
+++ b/lib/ntlmauth/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/lib/ntlmauth/ntlmauth.cc b/lib/ntlmauth/ntlmauth.cc
index 2704fbb23c72840675b9e09a2c8d6b2cc1749a05..fe21f06b7760c146b51361914073aee6c2805527 100644 (file)
--- a/lib/ntlmauth/ntlmauth.cc
+++ b/lib/ntlmauth/ntlmauth.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/ntlmauth/ntlmauth.h b/lib/ntlmauth/ntlmauth.h
index 58dbfe1106571e2b0e311d743e7f0e975bcf30f4..2c14ebee5231804dd2780f867eebe5994f11c2fd 100644 (file)
--- a/lib/ntlmauth/ntlmauth.h
+++ b/lib/ntlmauth/ntlmauth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/ntlmauth/support_bits.cci b/lib/ntlmauth/support_bits.cci
index b74c2bf33c463fdf7bedf06c7f4fc4cf4a93012e..f60771bccbdb90d1d30365791dab43bac505fe42 100644 (file)
--- a/lib/ntlmauth/support_bits.cci
+++ b/lib/ntlmauth/support_bits.cci
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/ntlmauth/support_endian.h b/lib/ntlmauth/support_endian.h
index dea73c6a0f4c4fab3bd617f7111645f76a586ac6..c0f79cea4b5368e485fc12a8f96849e3079904dc 100644 (file)
--- a/lib/ntlmauth/support_endian.h
+++ b/lib/ntlmauth/support_endian.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/radix.c b/lib/radix.c
index 817b2b77921d933e6ee0151949570a178878c5d1..337f8f6b9416462559d7bd04700dc08a7ddfd79d 100644 (file)
--- a/lib/radix.c
+++ b/lib/radix.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/lib/rfc1123.c b/lib/rfc1123.c
index 175b6a1e9da2ce6f3d3c964540bb15139e9efb6a..c2cba1e746de2398515d6fa7edceefddb1252fcf 100644 (file)
--- a/lib/rfc1123.c
+++ b/lib/rfc1123.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/lib/rfc1738.c b/lib/rfc1738.c
index 6c6b829c73fa87fcfc5cce1c7b47e8a42287ef96..02b79faa7edb7a6bacdec3ad8c0e89e794d5a54c 100644 (file)
--- a/lib/rfc1738.c
+++ b/lib/rfc1738.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/lib/rfc2617.c b/lib/rfc2617.c
index b4b1d5772041133e8e854f267b07ca08b43cb3fe..39bc56957b9811b65103719f28b9441e50c8678d 100644 (file)
--- a/lib/rfc2617.c
+++ b/lib/rfc2617.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/lib/rfcnb/CHANGELOG b/lib/rfcnb/CHANGELOG
index 66b11c7b54d49d10494be950e91e05974f740ac0..dbe2445a0c87da12c27b917e9a0710b19c05657b 100644 (file)
--- a/lib/rfcnb/CHANGELOG
+++ b/lib/rfcnb/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/lib/rfcnb/Makefile.am b/lib/rfcnb/Makefile.am
index bcd26c34a9c77721f9b643acf1e8f38054b7845b..d239a7a2b0fb1336c0e473fd592e921cc4246c45 100644 (file)
--- a/lib/rfcnb/Makefile.am
+++ b/lib/rfcnb/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/lib/rfcnb/ReadMe.1st b/lib/rfcnb/ReadMe.1st
index fd31949a23d46e5d9317c8b939dc075716384372..4d1caaa132602b5a893c742f4e7e84027c215541 100644 (file)
--- a/lib/rfcnb/ReadMe.1st
+++ b/lib/rfcnb/ReadMe.1st
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/rfcnb/byteorder.h b/lib/rfcnb/byteorder.h
index 810b70b4d810486c25b1d919b7693f6343e3ecb4..c75f9104053891e9a5add009de90e40f0fd8f19b 100644 (file)
--- a/lib/rfcnb/byteorder.h
+++ b/lib/rfcnb/byteorder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/rfcnb/notes b/lib/rfcnb/notes
index 01977eb8c354acc5b2d742292695ee6bb14ad64b..63148cd4351da64dbbae9c24160a69b210115473 100644 (file)
--- a/lib/rfcnb/notes
+++ b/lib/rfcnb/notes
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/rfcnb/rfcnb-common.h b/lib/rfcnb/rfcnb-common.h
index 1fa5d05357e237923a351a9cd289f787c744ecd2..fdd4e94838857371b3380ae3ed7c107b76eb6dd1 100644 (file)
--- a/lib/rfcnb/rfcnb-common.h
+++ b/lib/rfcnb/rfcnb-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/lib/rfcnb/rfcnb-error.h b/lib/rfcnb/rfcnb-error.h
index 379d049a5a173a7fe411029575af5c5c551fe7d7..519d996c5a117647c842b4372187ee56b680e301 100644 (file)
--- a/lib/rfcnb/rfcnb-error.h
+++ b/lib/rfcnb/rfcnb-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/lib/rfcnb/rfcnb-io.c b/lib/rfcnb/rfcnb-io.c
index 326809f8901d568e12a820b48ab7aea9b34d83ef..5fd880b557a9f64d17f4b6d0ad6be39c0fd5973c 100644 (file)
--- a/lib/rfcnb/rfcnb-io.c
+++ b/lib/rfcnb/rfcnb-io.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/lib/rfcnb/rfcnb-io.h b/lib/rfcnb/rfcnb-io.h
index ad23ab32ab84ec0e7acc8155c84775098796d54e..4f478a637f86113ef0719235b6b2fdf4d3e12b98 100644 (file)
--- a/lib/rfcnb/rfcnb-io.h
+++ b/lib/rfcnb/rfcnb-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/lib/rfcnb/rfcnb-priv.h b/lib/rfcnb/rfcnb-priv.h
index 4f40e74a4659a10b8c748ae5eff3e35e4ec12d0d..23c1b3e3aec35cd2a55064cddb32cf6aef41d3ba 100644 (file)
--- a/lib/rfcnb/rfcnb-priv.h
+++ b/lib/rfcnb/rfcnb-priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/rfcnb/rfcnb-util.c b/lib/rfcnb/rfcnb-util.c
index 36731f750c3589b27b8378fbc9d6f1be0b4cc3b4..c92e009c9b71cad4904e6d7391c16ad834cb9707 100644 (file)
--- a/lib/rfcnb/rfcnb-util.c
+++ b/lib/rfcnb/rfcnb-util.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/lib/rfcnb/rfcnb-util.h b/lib/rfcnb/rfcnb-util.h
index ece29601f4a19aa7def25cec478e97c8cdef4ee3..69ef037208f71c1d4be7c37ee0ccd937b9490dae 100644 (file)
--- a/lib/rfcnb/rfcnb-util.h
+++ b/lib/rfcnb/rfcnb-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/lib/rfcnb/rfcnb.h b/lib/rfcnb/rfcnb.h
index 654f24dfb82094f47c190c5e297c2ed537e82d6f..6d64410e8537f9cccfa5ff7ffd2131511afc412a 100644 (file)
--- a/lib/rfcnb/rfcnb.h
+++ b/lib/rfcnb/rfcnb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/rfcnb/session.c b/lib/rfcnb/session.c
index d4daadeaec4bf315cf1d769e5a1c12331b0326fc..abf919a817145975848830fa51ed8be24815e329 100644 (file)
--- a/lib/rfcnb/session.c
+++ b/lib/rfcnb/session.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/lib/rfcnb/std-includes.h b/lib/rfcnb/std-includes.h
index 1c34b2532ff5b47df130be0ce76ee4b2ed8021a7..3e372888d68ebfc1531ede1f598ff188e6972879 100644 (file)
--- a/lib/rfcnb/std-includes.h
+++ b/lib/rfcnb/std-includes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/smblib/Changes b/lib/smblib/Changes
index cd6fb5e077dc473a2b71923d6c5c11abda1516d8..678840d0f2e5af4e40e700f766b4f76c2a709da5 100644 (file)
--- a/lib/smblib/Changes
+++ b/lib/smblib/Changes
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/smblib/Makefile.am b/lib/smblib/Makefile.am
index edacdd8ae1d511cc40f4435e71299da21293f75e..436cc6fd31fed16343e143411cdb98804abe46db 100644 (file)
--- a/lib/smblib/Makefile.am
+++ b/lib/smblib/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/lib/smblib/ReadMe.1st b/lib/smblib/ReadMe.1st
index c6ce8ac0abbdc7bbb98ff15f546ecce76a834250..5925dd17b80c17b6b047e5f3e56a8a1e44e5990e 100644 (file)
--- a/lib/smblib/ReadMe.1st
+++ b/lib/smblib/ReadMe.1st
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/smblib/bad-chain.c b/lib/smblib/bad-chain.c
index 7a35234068699f30dde332e9433f0537bccd00fb..afe21a49354045b6502337bc21273ba6d21c6567 100644 (file)
--- a/lib/smblib/bad-chain.c
+++ b/lib/smblib/bad-chain.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/lib/smblib/exper.c b/lib/smblib/exper.c
index 9cd61aab84163d9c5eaa6de2229dce0b1ab50a37..1f89ab9b6efd2e9419a2e6325b383acb072d4813 100644 (file)
--- a/lib/smblib/exper.c
+++ b/lib/smblib/exper.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/lib/smblib/file.c b/lib/smblib/file.c
index ec72450dd1bce3925390b6ff4899f5fbadc714ea..0b9893dc8a7cb39fad7d684d65690d2b42b10d9f 100644 (file)
--- a/lib/smblib/file.c
+++ b/lib/smblib/file.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/lib/smblib/find_password.c b/lib/smblib/find_password.c
index ab02a4cf36275b5e9700103fba73ba0012a4f894..b9737d9858e01907a8b35b3a61bc3cd56d32df61 100644 (file)
--- a/lib/smblib/find_password.c
+++ b/lib/smblib/find_password.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/lib/smblib/md4.c b/lib/smblib/md4.c
index d45c8b89870a460eb4ef182518b5429236287ab5..842447d551543bc4bfe5e77496f705273d1124b2 100644 (file)
--- a/lib/smblib/md4.c
+++ b/lib/smblib/md4.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/lib/smblib/md4.h b/lib/smblib/md4.h
index d965976b3ebef7945790c0fbde5263eaaa9c4ebb..b9496973815ed855273d44b32683e5af3442c609 100644 (file)
--- a/lib/smblib/md4.h
+++ b/lib/smblib/md4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/smblib/smb-errors.c b/lib/smblib/smb-errors.c
index 4517051bdc02bca9f658575ccfceec15912dfd01..8d69068322c1a269e7a6bdb3b5a550b85b466822 100644 (file)
--- a/lib/smblib/smb-errors.c
+++ b/lib/smblib/smb-errors.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/lib/smblib/smbdes.c b/lib/smblib/smbdes.c
index 58deddc96a4553305e070c884ca0029a5119856a..7c823a419df08b2cb030b79881afbf1ef1ed98f6 100644 (file)
--- a/lib/smblib/smbdes.c
+++ b/lib/smblib/smbdes.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/lib/smblib/smbdes.h b/lib/smblib/smbdes.h
index e500a49dd4d97221ef3fae12429f1a65971bda03..299614904b5133dff3a92e642a93e844a1de8543 100644 (file)
--- a/lib/smblib/smbdes.h
+++ b/lib/smblib/smbdes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/smblib/smbencrypt.c b/lib/smblib/smbencrypt.c
index 2aca26a070a73f278a468cb0b4147a2db40da370..9ab1e2d6c9f42453d3438ba7c6e3d9cc8e605499 100644 (file)
--- a/lib/smblib/smbencrypt.c
+++ b/lib/smblib/smbencrypt.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/lib/smblib/smbencrypt.h b/lib/smblib/smbencrypt.h
index 655bfc2341651e199a4b17e8c47f75930dce9068..826b39efe7549560d661c6528e8ef12940586226 100644 (file)
--- a/lib/smblib/smbencrypt.h
+++ b/lib/smblib/smbencrypt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/smblib/smblib-api.c b/lib/smblib/smblib-api.c
index a4bd6bf088c2e8dded008ee4cc19157689e6a93c..fa081578f7dee507ddb275ea85dcd037bfb69eec 100644 (file)
--- a/lib/smblib/smblib-api.c
+++ b/lib/smblib/smblib-api.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/lib/smblib/smblib-common.h b/lib/smblib/smblib-common.h
index f794dd64c8bfc77c750e6a6d515ca597e8f0334c..b3c2e987f68ea7bd746b4bba66087ffe30dfb992 100644 (file)
--- a/lib/smblib/smblib-common.h
+++ b/lib/smblib/smblib-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/lib/smblib/smblib-priv.h b/lib/smblib/smblib-priv.h
index 7eedc07e2df244ca131a168c4becfe4d44f30364..f373279fcdbcd362627b8b24d32aa4453a552186 100644 (file)
--- a/lib/smblib/smblib-priv.h
+++ b/lib/smblib/smblib-priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/smblib/smblib-util.c b/lib/smblib/smblib-util.c
index c6376693b8c1b79e6b001cfbbda71dbbd0c8db5b..7f111a2820bb144431f616c9da172b67c448a731 100644 (file)
--- a/lib/smblib/smblib-util.c
+++ b/lib/smblib/smblib-util.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/lib/smblib/smblib.c b/lib/smblib/smblib.c
index 8ec836a12ab52a8c47e21c4ab71adedc7450d879..1d82781dd0cf3bc3facc2da44dda900cfeb3e727 100644 (file)
--- a/lib/smblib/smblib.c
+++ b/lib/smblib/smblib.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/lib/smblib/smblib.h b/lib/smblib/smblib.h
index 5dbdc07e4a3ba779800099895e1ff8d1b1b93c31..48ad43efc81d4868064e280d8541097608e90061 100644 (file)
--- a/lib/smblib/smblib.h
+++ b/lib/smblib/smblib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/smblib/std-defines.h b/lib/smblib/std-defines.h
index 9348278289c5a7acbcfe5179189e45338a41606b..939365922cfae60846662356f87024e10fe40f23 100644 (file)
--- a/lib/smblib/std-defines.h
+++ b/lib/smblib/std-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/lib/snmplib/Makefile.am b/lib/snmplib/Makefile.am
index c31885d685993ca03fdbae8884ed0c0d3a66631f..c1e1aaec92923d311ed27a19cf6da9c84d93b19c 100644 (file)
--- a/lib/snmplib/Makefile.am
+++ b/lib/snmplib/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/lib/snmplib/asn1.c b/lib/snmplib/asn1.c
index 708d626237471e86b6bbdf0be372343755ad5062..5cab2b5d8b95e8c5cebc59a7fd8398f78d6466db 100644 (file)
--- a/lib/snmplib/asn1.c
+++ b/lib/snmplib/asn1.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/lib/snmplib/coexistance.c b/lib/snmplib/coexistance.c
index 534ff7e23d8c9075ae6198959e2463a2052725c0..6516a1ade117b9c1a685203ae9922dbedb62a3ab 100644 (file)
--- a/lib/snmplib/coexistance.c
+++ b/lib/snmplib/coexistance.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/lib/snmplib/mib.c b/lib/snmplib/mib.c
index 8258a8d66152daec5e595f2cd8bce0106ef88f3a..91a883142f7992fb9471d30f1b134571f6419bea 100644 (file)
--- a/lib/snmplib/mib.c
+++ b/lib/snmplib/mib.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/lib/snmplib/parse.c b/lib/snmplib/parse.c
index ee320a20476e192a5e5f22578fd9e8f9d5e97cec..248ff0b9012a663471cc89907002169e58c706b5 100644 (file)
--- a/lib/snmplib/parse.c
+++ b/lib/snmplib/parse.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/lib/snmplib/snmp_api.c b/lib/snmplib/snmp_api.c
index 313339bd75f772844ca827ae1ffac0be6126b93d..3d2c963524a72e1c61b22af0ae14547d4554548a 100644 (file)
--- a/lib/snmplib/snmp_api.c
+++ b/lib/snmplib/snmp_api.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/lib/snmplib/snmp_api_error.c b/lib/snmplib/snmp_api_error.c
index bfd77db842bde8d7388f5d2ddcbcd0e4a63686e7..d17399c8544e925c1830d44cdad8c88630b16273 100644 (file)
--- a/lib/snmplib/snmp_api_error.c
+++ b/lib/snmplib/snmp_api_error.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/lib/snmplib/snmp_error.c b/lib/snmplib/snmp_error.c
index 5f888c6acc2e66ffe19db64103f6c25ffebe4949..9f543ece0fc4544c93d9d5021632634c3466b9a8 100644 (file)
--- a/lib/snmplib/snmp_error.c
+++ b/lib/snmplib/snmp_error.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/lib/snmplib/snmp_msg.c b/lib/snmplib/snmp_msg.c
index 6845a7547c5e2aa93bdd1e4d33928c531941a7db..b7d611a049ad76bc9abc49e2a95121ffc9f10cfd 100644 (file)
--- a/lib/snmplib/snmp_msg.c
+++ b/lib/snmplib/snmp_msg.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/lib/snmplib/snmp_pdu.c b/lib/snmplib/snmp_pdu.c
index 9bc1b68f9a4e7b80fc402c94cb94248008b418d2..2c33567afa1b6148bc6f429a15d28d775ce0bf72 100644 (file)
--- a/lib/snmplib/snmp_pdu.c
+++ b/lib/snmplib/snmp_pdu.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/lib/snmplib/snmp_vars.c b/lib/snmplib/snmp_vars.c
index 351245e69db5329a7184edd6a79f97e31a1fe0fc..517ade0d01ccbb3e48a23e7b32a58680232d7d04 100644 (file)
--- a/lib/snmplib/snmp_vars.c
+++ b/lib/snmplib/snmp_vars.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/lib/snmplib/snmplib_debug.c b/lib/snmplib/snmplib_debug.c
index 1586499a0ec424981d130ef77519f150c4185f06..fbaf3d534902c90c473e4a48841d7615b4bfed22 100644 (file)
--- a/lib/snmplib/snmplib_debug.c
+++ b/lib/snmplib/snmplib_debug.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/lib/sspwin32.cc b/lib/sspwin32.cc
index 57065c21b85a4cc9343234744123a9823ff03d5e..aa592daffe494b8b4c2e7eda8f78c508e1f952a0 100644 (file)
--- a/lib/sspwin32.cc
+++ b/lib/sspwin32.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/stub_memaccount.c b/lib/stub_memaccount.c
index c8bc751050acbe10a7a3c81a77b39006275ee3a2..adbc1af81a70c0c00676b21fab6d4097a4028f69 100644 (file)
--- a/lib/stub_memaccount.c
+++ b/lib/stub_memaccount.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/lib/tests/testRFC1738.cc b/lib/tests/testRFC1738.cc
index af72709d9290a09855529e242aa87c090f4eb44d..55966be6cb7fe276d665138debab3e90440b2cd8 100644 (file)
--- a/lib/tests/testRFC1738.cc
+++ b/lib/tests/testRFC1738.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/tests/testRFC1738.h b/lib/tests/testRFC1738.h
index 834d93dc22e939364ab5931802e28c672a652a7a..d589d841d1330cecb97e31cc687c1620e8be4213 100644 (file)
--- a/lib/tests/testRFC1738.h
+++ b/lib/tests/testRFC1738.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/lib/util.c b/lib/util.c
index 65ae8875c270b0f42fb5284e085e0d0a506ad337..64620f8cc60f71317fbdacaf732713e35f1c23ff 100644 (file)
--- a/lib/util.c
+++ b/lib/util.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/lib/xusleep.c b/lib/xusleep.c
index d2c0b2ab106799f3aaaa3814010321001085791e..c9ab71906f88176e65990803cfc1059e9710ab8f 100644 (file)
--- a/lib/xusleep.c
+++ b/lib/xusleep.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/mkrelease.sh b/mkrelease.sh
index ba807ba4693664b9050c124ebe83ac96839b3a71..be01a80098655e05f67ef03a72afbb007f3641ca 100755 (executable)
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -ex
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/mksnapshot-cron.sh b/mksnapshot-cron.sh
index caef23395987cfebfbe0d4b91866a95acf8dbfd9..470fac1d408ce186b7487a894df1e12601d9a87d 100755 (executable)
--- a/mksnapshot-cron.sh
+++ b/mksnapshot-cron.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/mksnapshot.sh b/mksnapshot.sh
index a86c4e33116b80453baff5a4be960e1d0ff1326f..7db273c698c22e5678a26ebce5af7e6d2058ec7c 100755 (executable)
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/AnnounceCache.pl b/scripts/AnnounceCache.pl
index 52eaa0a7ff5e6cfc703f60d008e063610297356c..8b9085700359120c5569b6b0ae949cb00fedad9d 100755 (executable)
--- a/scripts/AnnounceCache.pl
+++ b/scripts/AnnounceCache.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/Makefile.am b/scripts/Makefile.am
index 0153192e6ae145b434572166bfddafaf3474cddd..2e8b47cc97de35862e2a9baae92211f40b6eb8b9 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/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/scripts/PerUser.pl b/scripts/PerUser.pl
index 208be283608feee1ff8abce0ce6f4d676ab87ed9..070a7749588bb196ac54a4aafd8400dd8efbcdde 100755 (executable)
--- a/scripts/PerUser.pl
+++ b/scripts/PerUser.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/Squid/ParseLog.pm b/scripts/Squid/ParseLog.pm
index b8be524e453f88ff083c75ab9e8a5c61fa3ba322..543cb2c5c948b8a67acdca25dcf0432bb43a358b 100644 (file)
--- a/scripts/Squid/ParseLog.pm
+++ b/scripts/Squid/ParseLog.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+# * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 # *
 # * Squid software is distributed under GPLv2+ license and includes
 # * contributions from numerous individuals and organizations.

diff --git a/scripts/access-log-matrix.pl b/scripts/access-log-matrix.pl
index 9f8ad22c72aad849751a793a030d9f6f247ee13a..0c0abb82e613739af4713e27e54c073b42b56495 100755 (executable)
--- a/scripts/access-log-matrix.pl
+++ b/scripts/access-log-matrix.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/boiler-mgr.pl b/scripts/boiler-mgr.pl
index 430ae115bfaa43c4ff031c8b46ea47c8a31854ee..eee7ac73fc077ae3648f935ca6556dff5adc2725 100755 (executable)
--- a/scripts/boiler-mgr.pl
+++ b/scripts/boiler-mgr.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/boilerplate.h b/scripts/boilerplate.h
index 45f31223709af586b4722286bb483a65d686fb11..069809f2c4a7c0a640e298703383ccf4eea78836 100644 (file)
--- a/scripts/boilerplate.h
+++ b/scripts/boilerplate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/scripts/cache-compare.pl b/scripts/cache-compare.pl
index e91e66a2d13a6eea4c3a20decac13fea4bef1303..1b98b9fc4ea7fb87346ef37ef0e7fc97e1a30dfc 100755 (executable)
--- a/scripts/cache-compare.pl
+++ b/scripts/cache-compare.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/cachetrace.pl b/scripts/cachetrace.pl
index 1a5d406f60513a837ef9526f31fc4148577536dd..b976f0e4e44a5b27416db9400ae1c1fd3ed47d31 100755 (executable)
--- a/scripts/cachetrace.pl
+++ b/scripts/cachetrace.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/calc-must-ids.pl b/scripts/calc-must-ids.pl
index 0b68ea4873fcaa97876d0e9b58a1275e0c3527b9..25a52650fb86f6159f56cbf4ae606eed4f564647 100755 (executable)
--- a/scripts/calc-must-ids.pl
+++ b/scripts/calc-must-ids.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/scripts/calc-must-ids.sh b/scripts/calc-must-ids.sh
index 3b0c695505169c2d3cad21d8838f46a97a611aad..6c940a07ffc7aea3faca1fb9da061cf0cb6d4677 100755 (executable)
--- a/scripts/calc-must-ids.sh
+++ b/scripts/calc-must-ids.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/scripts/check_cache.pl b/scripts/check_cache.pl
index a9d076a7c7998468cd0ceedf591477dcc6558bfd..3de79eea2c4335d6a6558eb89e6995ce0a0b313f 100755 (executable)
--- a/scripts/check_cache.pl
+++ b/scripts/check_cache.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/convert.configure.to.os2 b/scripts/convert.configure.to.os2
index 1212a19b12583f6c5616daab3807fc97310ed298..d7af0471a5b649ca236db2c8c9a5bf4a37e305c7 100644 (file)
--- a/scripts/convert.configure.to.os2
+++ b/scripts/convert.configure.to.os2
@@ -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/scripts/fileno-to-pathname.pl b/scripts/fileno-to-pathname.pl
index c51718017bad68768628c9468a173c75f67cafa8..42feb46cc924b704744b67582ac205433797d306 100755 (executable)
--- a/scripts/fileno-to-pathname.pl
+++ b/scripts/fileno-to-pathname.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/find-alive.pl b/scripts/find-alive.pl
index b2953204af8db5b34aa59424c004f796baa13034..514da1fbf91e1a78257e57d5ffe07a9e5d19e00f 100755 (executable)
--- a/scripts/find-alive.pl
+++ b/scripts/find-alive.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/flag_truncs.pl b/scripts/flag_truncs.pl
index f3a12fc9ed8cf41a5d42bd58092bda1f1934564a..c1adb5e5ca9e463033050a6d3717895c32e08e62 100755 (executable)
--- a/scripts/flag_truncs.pl
+++ b/scripts/flag_truncs.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/format-makefile-am.pl b/scripts/format-makefile-am.pl
index 1f61999c9586b8a3d03bc6dffff278128c68c4f2..875cdb590bad6655fe0390a4d87b094775095350 100755 (executable)
--- a/scripts/format-makefile-am.pl
+++ b/scripts/format-makefile-am.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/scripts/formater.pl b/scripts/formater.pl
index 91efbbf121a4bfb7aea3d9cfcede00ad8147404e..854a4e535fb84702912b61163bfe8d38e8a9d4ad 100755 (executable)
--- a/scripts/formater.pl
+++ b/scripts/formater.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/scripts/icp-test.pl b/scripts/icp-test.pl
index e5f20eed2a89a3240031932f146c8538c0b5b638..0bf46e2e43b36bdfc16431e24fc561938c2477ee 100755 (executable)
--- a/scripts/icp-test.pl
+++ b/scripts/icp-test.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/icpserver.pl b/scripts/icpserver.pl
index 6778e63bab563262c4f421ac8a40852ae8bceed7..86bff39a1f2f45888faff737abbb44eccc144c9c 100755 (executable)
--- a/scripts/icpserver.pl
+++ b/scripts/icpserver.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/maintenance/HERE-obsolete b/scripts/maintenance/HERE-obsolete
index c3cc64c19a926bc55bf847da00c3a2d240c342c3..700172c1674c360561e32f50c3fe07d264b8e2ac 100755 (executable)
--- a/scripts/maintenance/HERE-obsolete
+++ b/scripts/maintenance/HERE-obsolete
@@ -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.

diff --git a/scripts/maintenance/sort-includes.pl b/scripts/maintenance/sort-includes.pl
index d84b47b0cb40fd57d9ce668335208ba7d3d64702..5df8be3a2e48a7412de5ebc65b106bfdcf4ba7fe 100755 (executable)
--- a/scripts/maintenance/sort-includes.pl
+++ b/scripts/maintenance/sort-includes.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/scripts/merge-cf.data.pre.awk b/scripts/merge-cf.data.pre.awk
index 8db313c610b50279242da7c63bbc3bd7c9155bbb..2068a0567786b180323037c218527c014a1d3c47 100644 (file)
--- a/scripts/merge-cf.data.pre.awk
+++ b/scripts/merge-cf.data.pre.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/scripts/merge-cf.data.pre.pl b/scripts/merge-cf.data.pre.pl
index 26ee6cc16636e6235574bba2e451b1f76d82d3fd..5668b10ccb1a079828dec2e7bdc758ba9343154c 100755 (executable)
--- a/scripts/merge-cf.data.pre.pl
+++ b/scripts/merge-cf.data.pre.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/scripts/mk-error-details-po.pl b/scripts/mk-error-details-po.pl
index 9a49b93826ebc0fd4815e0f21a3d32a85e3cc0b0..92491af1c91d2cb562bd6a469cb359d30f5acd04 100755 (executable)
--- a/scripts/mk-error-details-po.pl
+++ b/scripts/mk-error-details-po.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/remove-cfg.sh b/scripts/remove-cfg.sh
index 77aaa106ad07ef4551bcda8798996891d5943e8d..d6ac4d868de849aa81e32ef2fe181df1763a7bfd 100755 (executable)
--- a/scripts/remove-cfg.sh
+++ b/scripts/remove-cfg.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/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
index 45d5fbba11e9cbebc945805bac45906e05740553..53bb153334ee8507387674ee081d13f0e50fb259 100755 (executable)
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.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/scripts/split-cf.data.pre.pl b/scripts/split-cf.data.pre.pl
index 0f602aaf1d7741d7c96b80f9e89e68b93df73082..b9abfdd15030d7bfbc3b93801afbe3656835341c 100755 (executable)
--- a/scripts/split-cf.data.pre.pl
+++ b/scripts/split-cf.data.pre.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/tcp-banger.pl b/scripts/tcp-banger.pl
index c7df9f31aa8de0cb6ea21c2ed7f87875aaa5a2f4..24a7bc671e19bced826f8f79e4888a2e29f0e8be 100755 (executable)
--- a/scripts/tcp-banger.pl
+++ b/scripts/tcp-banger.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/trace-entry.pl b/scripts/trace-entry.pl
index e65846d17cbcf2250be61333ebd25d629becf433..9fd8f4c18e5ea828ccda3c469ce87798c414e46d 100755 (executable)
--- a/scripts/trace-entry.pl
+++ b/scripts/trace-entry.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/trace-job.pl b/scripts/trace-job.pl
index 5533974018b21cd4e22f7c357d11abab28303afd..6609e8269c91f539b3bd68e00f8733f5a547a3bb 100755 (executable)
--- a/scripts/trace-job.pl
+++ b/scripts/trace-job.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/trace-kid.pl b/scripts/trace-kid.pl
index e9dbb07718498774156306156cda13df93a09522..02b633cdfe92c306d3a22fc7625791690e9ca07f 100755 (executable)
--- a/scripts/trace-kid.pl
+++ b/scripts/trace-kid.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/trace-master.pl b/scripts/trace-master.pl
index 83c5c644f4d14ec70a3dda54fdf8534fa6a55b2d..8bed454d7826a76d4076a1f79d2172b65d20eaa9 100755 (executable)
--- a/scripts/trace-master.pl
+++ b/scripts/trace-master.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/scripts/udp-banger.pl b/scripts/udp-banger.pl
index da781b67f3fac61ec669720bdbcc84118bfc40e9..e22a1ee50f8aaacb19f77e4175aab3faa1ad6634 100755 (executable)
--- a/scripts/udp-banger.pl
+++ b/scripts/udp-banger.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/update-pot.sh b/scripts/update-pot.sh
index 2e0e993c1f09935eebb2aa3d4118b48bf41cd253..9e63242a52c4cd2e4fc50165ba1a7bf261af7806 100755 (executable)
--- a/scripts/update-pot.sh
+++ b/scripts/update-pot.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/scripts/upgrade-1.0-store.pl b/scripts/upgrade-1.0-store.pl
index f6c2524eab844a4e9123ccd073b2cf473ff9a364..a1c3b78a2c6aa764459f5ccfb4b1794a3d14ba91 100755 (executable)
--- a/scripts/upgrade-1.0-store.pl
+++ b/scripts/upgrade-1.0-store.pl
@@ -1,6 +1,6 @@
 #!/usr/local/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/scripts/verify_errorpages.pl b/scripts/verify_errorpages.pl
index d228553fd601c841b4eaa8805ed957bce7629e21..d016457e3195fa7c6c32cd0dd65c3a268b19d9da 100755 (executable)
--- a/scripts/verify_errorpages.pl
+++ b/scripts/verify_errorpages.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/scripts/www/build-cfg-help.pl b/scripts/www/build-cfg-help.pl
index b1568fd14df38b3568d8afa9eb021282134ce95c..1f9a6e25251b3e222e24004dc5c6b46a14dea389 100755 (executable)
--- a/scripts/www/build-cfg-help.pl
+++ b/scripts/www/build-cfg-help.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+# * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 # *
 # * Squid software is distributed under GPLv2+ license and includes
 # * contributions from numerous individuals and organizations.

diff --git a/scripts/www/template.html b/scripts/www/template.html
index f8ff2e72d4e57ee0f4650b6f391bdc87d8e969bf..cc123aff867571bd5097fa130bde6e58a43abd99 100644 (file)
--- a/scripts/www/template.html
+++ b/scripts/www/template.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <meta type="copyright" content="Copyright (C) 1996-2021 The Squid Software Foundation and contributors">
+    <meta type="copyright" content="Copyright (C) 1996-2022 The Squid Software Foundation and contributors">
     <title>Squid %version% Configuration File: %title%</title>
     <meta name="keywords" content="squid squid.conf config configure %name%" />
     <meta name="description" content="Squid %version%  %name% " />

diff --git a/squid.dox b/squid.dox
index e455e40dec70ae63197208cf8ccd39459d293de4..f9a9f839bd4bf001693a8d98ebc8d51eeb70d202 100644 (file)
--- a/squid.dox
+++ b/squid.dox
@@ -24,7 +24,7 @@
 # for the list of possible encodings.
 # The default value is: UTF-8.
 
-## Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.

diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc
index 4e4f0edc13607872ac2ca9b0b9fca35fdf6949b2..ccc9eda84d940fb3f9aad906bb32dce08a38ed9e 100644 (file)
--- a/src/AccessLogEntry.cc
+++ b/src/AccessLogEntry.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index abe9e56d769c971691574a3d51cbf0ca595693cf..28b0c58ae92f0b2951c71bb0a412b5f44011e39e 100644 (file)
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index 361c18e75d4e74b0072d440fde061c17cd90f464..0af0197c31cb4150b7d5df5ed14bba997cd583fd 100644 (file)
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/AsyncEngine.cc b/src/AsyncEngine.cc
index 6f16004333101fbffddcae51001c4d24abc75040..1c3988a9440014b280abb690369b1510b51086aa 100644 (file)
--- a/src/AsyncEngine.cc
+++ b/src/AsyncEngine.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/AsyncEngine.h b/src/AsyncEngine.h
index 8938f41905d2c3b2126862b795a324033e9fc2cd..6ab1ff3bab2652fcf50602f7578bca8ed8b774a7 100644 (file)
--- a/src/AsyncEngine.h
+++ b/src/AsyncEngine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/AuthReg.cc b/src/AuthReg.cc
index 88ef08f93bb1aaee3a60c1c9175745bc55037283..f0a499d5aa5dc72adb494b7ced2d743f003bd6b2 100644 (file)
--- a/src/AuthReg.cc
+++ b/src/AuthReg.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/AuthReg.h b/src/AuthReg.h
index 4cd3b4c95e3ae84e136ffc528f60e515690d175c..36b2c89951adac40091b11adf3c2e25bd328c538 100644 (file)
--- a/src/AuthReg.h
+++ b/src/AuthReg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/BandwidthBucket.cc b/src/BandwidthBucket.cc
index 8a0b642c09650efdae9efa570cbf2d9080fc098c..ba839d97725e8d7531b1538c89b65a513d067a53 100644 (file)
--- a/src/BandwidthBucket.cc
+++ b/src/BandwidthBucket.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/BandwidthBucket.h b/src/BandwidthBucket.h
index 4c4c8b941ca16d477d359a0d74c6c334dc0dfa72..4da2e2b987430f66acb43777aad78d978c484d54 100644 (file)
--- a/src/BandwidthBucket.h
+++ b/src/BandwidthBucket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc
index e321bfe1ede1cca9f746f4487b7c495be7301a5f..a10f766157331c02961d9274b76089bc838b5918 100644 (file)
--- a/src/BodyPipe.cc
+++ b/src/BodyPipe.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -133,12 +133,12 @@ BodyPipe::BodyPipe(Producer *aProducer): theBodySize(-1),
     // TODO: teach MemBuf to start with zero minSize
     // TODO: limit maxSize by theBodySize, when known?
     theBuf.init(2*1024, MaxCapacity);
-    debugs(91,7, HERE << "created BodyPipe" << status());
+    debugs(91,7, "created BodyPipe" << status());
 }
 
 BodyPipe::~BodyPipe()
 {
-    debugs(91,7, HERE << "destroying BodyPipe" << status());
+    debugs(91,7, "destroying BodyPipe" << status());
     assert(!theProducer);
     assert(!theConsumer);
     theBuf.clean();
@@ -155,7 +155,7 @@ void BodyPipe::setBodySize(uint64_t aBodySize)
     assert(!theConsumer);
 
     theBodySize = aBodySize;
-    debugs(91,7, HERE << "set body size" << status());
+    debugs(91,7, "set body size" << status());
 }
 
 uint64_t BodyPipe::bodySize() const
@@ -194,13 +194,13 @@ void
 BodyPipe::clearProducer(bool atEof)
 {
     if (theProducer.set()) {
-        debugs(91,7, HERE << "clearing BodyPipe producer" << status());
+        debugs(91,7, "clearing BodyPipe producer" << status());
         theProducer.clear();
         if (atEof) {
             if (!bodySizeKnown())
                 theBodySize = thePutSize;
             else if (bodySize() != thePutSize)
-                debugs(91,3, HERE << "aborting on premature eof" << status());
+                debugs(91,3, "aborting on premature eof" << status());
         } else {
             // asserta that we can detect the abort if the consumer joins later
             assert(!bodySizeKnown() || bodySize() != thePutSize);
@@ -241,7 +241,7 @@ BodyPipe::setConsumerIfNotLate(const Consumer::Pointer &aConsumer)
     Must(!abortedConsumption); // did not promise to never consume
 
     theConsumer = aConsumer;
-    debugs(91,7, HERE << "set consumer" << status());
+    debugs(91,7, "set consumer" << status());
     if (theBuf.hasContent())
         scheduleBodyDataNotification();
     if (!theProducer)
@@ -254,7 +254,7 @@ void
 BodyPipe::clearConsumer()
 {
     if (theConsumer.set()) {
-        debugs(91,7, HERE << "clearing consumer" << status());
+        debugs(91,7, "clearing consumer" << status());
         theConsumer.clear();
         // do not abort if we have not consumed so that HTTP or ICAP can retry
         // benign xaction failures due to persistent connection race conditions
@@ -316,7 +316,7 @@ void
 BodyPipe::enableAutoConsumption()
 {
     mustAutoConsume = true;
-    debugs(91,5, HERE << "enabled auto consumption" << status());
+    debugs(91,5, "enabled auto consumption" << status());
     startAutoConsumptionIfNeeded();
 }
 
@@ -336,7 +336,7 @@ BodyPipe::startAutoConsumptionIfNeeded()
 
     theConsumer = new BodySink(this);
     AsyncJob::Start(theConsumer);
-    debugs(91,7, HERE << "starting auto consumption" << status());
+    debugs(91,7, "starting auto consumption" << status());
     scheduleBodyDataNotification();
 }
 
@@ -381,7 +381,7 @@ BodyPipe::postConsume(size_t size)
 {
     assert(!isCheckedOut);
     theGetSize += size;
-    debugs(91,7, HERE << "consumed " << size << " bytes" << status());
+    debugs(91,7, "consumed " << size << " bytes" << status());
     if (mayNeedMoreData()) {
         AsyncCall::Pointer call=  asyncCall(91, 7,
                                             "BodyProducer::noteMoreBodySpaceAvailable",
@@ -396,7 +396,7 @@ BodyPipe::postAppend(size_t size)
 {
     assert(!isCheckedOut);
     thePutSize += size;
-    debugs(91,7, HERE << "added " << size << " bytes" << status());
+    debugs(91,7, "added " << size << " bytes" << status());
 
     // We should not consume here even if mustAutoConsume because the
     // caller may not be ready for the data to be consumed during this call.
@@ -492,7 +492,7 @@ BodyPipeCheckout::~BodyPipeCheckout()
         // Do not pipe.undoCheckOut(*this) because it asserts or throws
         // TODO: consider implementing the long-term solution discussed at
         // http://www.mail-archive.com/squid-dev@squid-cache.org/msg07910.html
-        debugs(91,2, HERE << "Warning: cannot undo BodyPipeCheckout");
+        debugs(91,2, "Warning: cannot undo BodyPipeCheckout");
         thePipe.checkIn(*this);
     }
 }

diff --git a/src/BodyPipe.h b/src/BodyPipe.h
index d8bf639aed68503e222acd802a3102499ae623cb..01d10c9bfe92034f7e5469580242e295a33c1747 100644 (file)
--- a/src/BodyPipe.h
+++ b/src/BodyPipe.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc
index 609fcd00482a91efe029b0b7e4f1b40adbd1cf30..ea04639a0f4783f22f5d5752e6231e98f19e83d4 100644 (file)
--- a/src/CacheDigest.cc
+++ b/src/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/CacheDigest.h b/src/CacheDigest.h
index d7ff8959de9974c425ff978c212c4c1e618aac84..bb0f24c334cb725d64d911cdc3c2f8b55321fbe7 100644 (file)
--- a/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CacheManager.h b/src/CacheManager.h
index 793f7d464f3d6887a1b72e0923a5890b7766c4dc..71e69b039d07001ddc935f6fdb76e6bc84dbd3e8 100644 (file)
--- a/src/CacheManager.h
+++ b/src/CacheManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CachePeer.cc b/src/CachePeer.cc
index 75e0e669ccb846fd729859e1f4fde19feb1e6c19..bad71c58c1b1cb7bb079e3448bf1b8d6010d9498 100644 (file)
--- a/src/CachePeer.cc
+++ b/src/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/CachePeer.h b/src/CachePeer.h
index 28180dacf4fe44b327edaa92ad339bdcf9b6663b..f6b8deaabd6e3e9b37224b661d68e77b6527c038 100644 (file)
--- a/src/CachePeer.h
+++ b/src/CachePeer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ClientDelayConfig.cc b/src/ClientDelayConfig.cc
index 93b4f6644b1ef1db83cf15f3b616dfc6c42192d6..3389844957efcdfb59f18418a4a5355dc0468f2d 100644 (file)
--- a/src/ClientDelayConfig.cc
+++ b/src/ClientDelayConfig.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ClientDelayConfig.h b/src/ClientDelayConfig.h
index 590a433508fcc423c569050ed442903753cf1ece..94f0863047f5aa364f59c10444defffaee66c64d 100644 (file)
--- a/src/ClientDelayConfig.h
+++ b/src/ClientDelayConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ClientInfo.h b/src/ClientInfo.h
index 9e2141b325d6f8f0ba3b0550929e5421e5cc80c6..8478c2baa3ac9aa7829aa7001e090d5a5903438b 100644 (file)
--- a/src/ClientInfo.h
+++ b/src/ClientInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ClientRequestContext.h b/src/ClientRequestContext.h
index a839289154081695c35e30dd60102ecf655899a8..55a7a4382288e075923072437893673d6bbce387 100644 (file)
--- a/src/ClientRequestContext.h
+++ b/src/ClientRequestContext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CollapsedForwarding.cc b/src/CollapsedForwarding.cc
index 9892f393218891d89b478cfaae70a3084757958f..5ad397c0ee6e474f76c88327a3d108e58a48d6ab 100644 (file)
--- a/src/CollapsedForwarding.cc
+++ b/src/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/CollapsedForwarding.h b/src/CollapsedForwarding.h
index ecd135eb01d07a1915fc61b5393e2207c41770e6..7e2acfcc94a28bd2a4f67954ba7130f93a824ccb 100644 (file)
--- a/src/CollapsedForwarding.h
+++ b/src/CollapsedForwarding.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CollapsingHistory.h b/src/CollapsingHistory.h
index 523368e161c029b170d5aff18c5e1b99c9d29cb1..06723ea0d227821739dfc6d7ed575489f21a74c4 100644 (file)
--- a/src/CollapsingHistory.h
+++ b/src/CollapsingHistory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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.dox b/src/Comm.dox
index 6479745cc9e2c63c9c217c4de10b8b6446b056e1..b4cd52cfc84f23fe5919c383ed8f534f9528222d 100644 (file)
--- a/src/Comm.dox
+++ b/src/Comm.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/CommCalls.cc b/src/CommCalls.cc
index 753fa5cafc98a5290471944b02853573ee7b5aa5..7933a50d471306ba77526625740c70f51051567a 100644 (file)
--- a/src/CommCalls.cc
+++ b/src/CommCalls.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -108,7 +108,7 @@ CommIoCbParams::syncWithComm()
     // change parameters if the call was scheduled before comm_close but
     // is being fired after comm_close
     if ((conn->fd < 0 || fd_table[conn->fd].closing()) && flag != Comm::ERR_CLOSING) {
-        debugs(5, 3, HERE << "converting late call to Comm::ERR_CLOSING: " << conn);
+        debugs(5, 3, "converting late call to Comm::ERR_CLOSING: " << conn);
         flag = Comm::ERR_CLOSING;
     }
     return true; // now we are in sync and can handle the call

diff --git a/src/CommCalls.h b/src/CommCalls.h
index 40f1a4c2fca41641ff1bbcb52a7daed56ad7893a..c2adfcf34b5f1dab7cd33a144d589328dff3c661 100644 (file)
--- a/src/CommCalls.h
+++ b/src/CommCalls.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CommRead.h b/src/CommRead.h
index cdbc96f45ab90af66f21c1d28d37a3862d7698b5..b0459d78e11001a02a78d2d614b73afe77bc488f 100644 (file)
--- a/src/CommRead.h
+++ b/src/CommRead.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CommandLine.cc b/src/CommandLine.cc
index ccd7891839b996fa83034813ed637e9960881f10..ebb7809e8898bc106cd58bcb3ee476241b0d4df9 100644 (file)
--- a/src/CommandLine.cc
+++ b/src/CommandLine.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CommandLine.h b/src/CommandLine.h
index 244b9813cf70dd346c4665f6c715836399832efe..b9cc1d3fbea680585a8be2c2637b3ffb261317f4 100644 (file)
--- a/src/CommandLine.h
+++ b/src/CommandLine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Common.am b/src/Common.am
index cb4a5915731c69a1de1d4eec81e97090f9684613..20c7e7597ea5ce1ec21e10cbe3e11fd37b09c2ce 100644 (file)
--- a/src/Common.am
+++ b/src/Common.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/CommonPool.h b/src/CommonPool.h
index 3289a64a2a294246eadd0108a0c77c08e898a635..d9b57220f8abc1a4d24e5405217dd149c44402e2 100644 (file)
--- a/src/CommonPool.h
+++ b/src/CommonPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h
index a609d702f4de57ab3dcfeca4a8b8634666336efc..add27d2d29cb08e072be16d24798b8660c858f58 100644 (file)
--- a/src/CompositePoolNode.h
+++ b/src/CompositePoolNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ConfigOption.cc b/src/ConfigOption.cc
index 8e25dd88915fdde22582d3f0617e2e78050795b4..9b21a835d2ffd5f67fa0a49b404df54ef75cac68 100644 (file)
--- a/src/ConfigOption.cc
+++ b/src/ConfigOption.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ConfigOption.h b/src/ConfigOption.h
index bfcee22ab5a2a82c5f2eb1b0edf4d442f41eaf6e..4fce80b1a2e6a41fd3ad4a151ed2d1388b11b447 100644 (file)
--- a/src/ConfigOption.h
+++ b/src/ConfigOption.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc
index 85af25754d010d87fa06fea8591a5eecb72640e5..5ecd4c5444d0cc080879b02e959c4f7b217758b2 100644 (file)
--- a/src/ConfigParser.cc
+++ b/src/ConfigParser.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ConfigParser.h b/src/ConfigParser.h
index 4dfb20ce1b3b9ffb1b863c89e221cf0850c68612..7c4d7bfe86585b7a089a16570ac8fda3b67634d3 100644 (file)
--- a/src/ConfigParser.h
+++ b/src/ConfigParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CpuAffinity.cc b/src/CpuAffinity.cc
index 93cbbeb62a7d4dfe3820e2ea5d981cd23b160ee3..234f6c26cfa15f508b90c2d001e4855a2a8b7fbc 100644 (file)
--- a/src/CpuAffinity.cc
+++ b/src/CpuAffinity.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CpuAffinity.h b/src/CpuAffinity.h
index 8ac4d6b4b3a806b9ffaa0b293db0307467dd1056..e69f622cffc93e26b31f6c85502ce5e51f515d92 100644 (file)
--- a/src/CpuAffinity.h
+++ b/src/CpuAffinity.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CpuAffinityMap.cc b/src/CpuAffinityMap.cc
index fc377edf632d9a2153befbd5a3a8748b85d3da12..757c6c02f411cfb36ff122166729931931a7535e 100644 (file)
--- a/src/CpuAffinityMap.cc
+++ b/src/CpuAffinityMap.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CpuAffinityMap.h b/src/CpuAffinityMap.h
index 47d9c2fbb38d14d6ae733c7be1689b846e70217f..c89f44ff4e895cdf79253da5f556422a418029cf 100644 (file)
--- a/src/CpuAffinityMap.h
+++ b/src/CpuAffinityMap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CpuAffinitySet.cc b/src/CpuAffinitySet.cc
index e79210102d3d968cb461e26068b33d3091e11380..96f9faf37f855f7f3c1205784ca148fcb4eb9ae3 100644 (file)
--- a/src/CpuAffinitySet.cc
+++ b/src/CpuAffinitySet.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/CpuAffinitySet.h b/src/CpuAffinitySet.h
index 3a21a245a930b25dbb1e3fa6138e168fe0cdd49d..4d1ca181bf75f09a568e4dea73e89d69cc78976b 100644 (file)
--- a/src/CpuAffinitySet.h
+++ b/src/CpuAffinitySet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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.h b/src/Debug.h
index 939b27d44606d9a7f2a8aa61b0092cbfcf2cfdcb..0f65a62179565f008b5ab684a8b9cc5f1d81cfd9 100644 (file)
--- a/src/Debug.h
+++ b/src/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.
@@ -144,7 +144,7 @@ std::ostream& ForceAlert(std::ostream& s);
  *
  * Its purpose is to inactivate calls made following previous debugs()
  * guidelines such as
- * debugs(1,2, HERE << "some message");
+ * debugs(1,2, "some message");
  *
  * His former objective is now absorbed in the debugs call itself
  */

diff --git a/src/DebugMessages.h b/src/DebugMessages.h
index 66c1a6e79b41f2b852c61b152d1bd914b933c547..914ff7ee2e49a8a19f4d7ef8601411f44331f52c 100644 (file)
--- a/src/DebugMessages.h
+++ b/src/DebugMessages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayBucket.cc b/src/DelayBucket.cc
index faad8cd5ba83033e241493c13ff30d12d3c5df8d..465c0395c548ca3a5f7df8a4db4489972bb009c1 100644 (file)
--- a/src/DelayBucket.cc
+++ b/src/DelayBucket.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayBucket.h b/src/DelayBucket.h
index 123ea58d9d780059153e4dd9c72bca76ead8b2ad..755b68e6c3f0768a1aeb07da2f5d6cd4cd68f3da 100644 (file)
--- a/src/DelayBucket.h
+++ b/src/DelayBucket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayConfig.cc b/src/DelayConfig.cc
index 1dd3745d8e8b99ad8552a2b2978c7e885cc0e7d4..669a91a4fb216983e988ae8131c730db5ac3b415 100644 (file)
--- a/src/DelayConfig.cc
+++ b/src/DelayConfig.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayConfig.h b/src/DelayConfig.h
index d47c8f7603887e8c95fc205d7a62c72ae9864e92..85ca504768342fed90e3b6e1856036871ef1ff69 100644 (file)
--- a/src/DelayConfig.h
+++ b/src/DelayConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayId.cc b/src/DelayId.cc
index 5cd831fec42a7838aa62e12bd45a170b40664739..961ea89ef0fe44c28096685a356a68379ae9c333 100644 (file)
--- a/src/DelayId.cc
+++ b/src/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/DelayId.h b/src/DelayId.h
index 74e9129f0c7b2b48cd90e4b49d2da353102a91b0..adf9e4cbecc5fd655017311ba50a0d434a6cf0fc 100644 (file)
--- a/src/DelayId.h
+++ b/src/DelayId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayIdComposite.h b/src/DelayIdComposite.h
index 10923d460e1748f380e7f767ce2e7c4cb0934462..61be1bbd2ab10cd9108873b96885fa29fb8cbe90 100644 (file)
--- a/src/DelayIdComposite.h
+++ b/src/DelayIdComposite.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayPool.cc b/src/DelayPool.cc
index 64d112da08c2ec496431cabd1cd176109662e684..f7f3214d6f1143d5bc41675651d64b5ef35388be 100644 (file)
--- a/src/DelayPool.cc
+++ b/src/DelayPool.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayPool.h b/src/DelayPool.h
index 0d261b37b8f67b3ecbf6beec01d1c5cb48f19ac2..ea6a33f952f42dc7dec3ab9d3832ab130f29d114 100644 (file)
--- a/src/DelayPool.h
+++ b/src/DelayPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayPools.h b/src/DelayPools.h
index 0d51ec3033ae4e931423184fc2d0a20e0acf507c..0852e391dddc0c4f155115f56c2a813e94cde43a 100644 (file)
--- a/src/DelayPools.h
+++ b/src/DelayPools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelaySpec.cc b/src/DelaySpec.cc
index 5bc6c5710b27bb667741b9d367ed40bcbf6b6722..735204b808baa9f066f94f3e1996083e12aea4e9 100644 (file)
--- a/src/DelaySpec.cc
+++ b/src/DelaySpec.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelaySpec.h b/src/DelaySpec.h
index 5433f46af2f79d36a6028fbbf3744e3e83489879..36a74bbb40de2d8c81f88872d70bebda7c437836 100644 (file)
--- a/src/DelaySpec.h
+++ b/src/DelaySpec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayTagged.cc b/src/DelayTagged.cc
index b3bd78ad15394327511cba73ed828e6e5bd7dafa..c016ec811c63e7eb7636ed73edb750545601443a 100644 (file)
--- a/src/DelayTagged.cc
+++ b/src/DelayTagged.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayTagged.h b/src/DelayTagged.h
index 7278c34b29abfcf2c90d3f402489cf55eb081e59..7a1e58fdb85c291e5607aa5162917047b3710075 100644 (file)
--- a/src/DelayTagged.h
+++ b/src/DelayTagged.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayUser.cc b/src/DelayUser.cc
index 4632211a5ed1a9c5bec6e1cbec4c1aafdf5aca66..46c9cd46a87ee0e5e695b16d146ce85251374b0e 100644 (file)
--- a/src/DelayUser.cc
+++ b/src/DelayUser.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -117,7 +117,7 @@ DelayUser::id(CompositePoolNode::CompositeSelectionDetails &details)
     if (!details.user || !details.user->user() || !details.user->user()->username())
         return new NullDelayId;
 
-    debugs(77, 3, HERE << "Adding a slow-down for User '" << details.user->user()->username() << "'");
+    debugs(77, 3, "Adding a slow-down for User '" << details.user->user()->username() << "'");
     return new Id(this, details.user->user());
 }
 

diff --git a/src/DelayUser.h b/src/DelayUser.h
index 4c0262a42a9420f8c5ebe30b895b2ea09f5ead04..015c4a1fa2b068d6f869a2224efa0fb5fbe45a19 100644 (file)
--- a/src/DelayUser.h
+++ b/src/DelayUser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayVector.cc b/src/DelayVector.cc
index ce0afef36c81898a924dabfef6f4f5f91a04ae7b..342b441fef08ff21eec59772cd27a28118514710 100644 (file)
--- a/src/DelayVector.cc
+++ b/src/DelayVector.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DelayVector.h b/src/DelayVector.h
index a17d41024f069a3424197913345b18adad341c87..1b2bd54f03a7f57ea46e9b65ae9d4adb05687c74 100644 (file)
--- a/src/DelayVector.h
+++ b/src/DelayVector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DescriptorSet.cc b/src/DescriptorSet.cc
index 937170f326bc2654b6380fd0011a91db1a814d43..95d9dcba79812acf3da07ed3199d64652722ac42 100644 (file)
--- a/src/DescriptorSet.cc
+++ b/src/DescriptorSet.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DescriptorSet.h b/src/DescriptorSet.h
index acc3e06d42d738fe260d5ab2dea7e52a07ee0cb2..31466da0ff9c127fbc23b03cfedd5307cad50ddb 100644 (file)
--- a/src/DescriptorSet.h
+++ b/src/DescriptorSet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc
index ff64f74372ad5b7ff76a8e346c29b88d0cffcdd3..c2454bcc476d9a54438963b68b6064ba8aa6ce37 100644 (file)
--- a/src/DiskIO/AIO/AIODiskFile.cc
+++ b/src/DiskIO/AIO/AIODiskFile.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (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,12 +64,12 @@ AIODiskFile::open(int flags, mode_t, RefCount<IORequestor> callback)
     ioRequestor = callback;
 
     if (fd < 0) {
-        debugs(79, 3, HERE << ": got failure (" << errno << ")");
+        debugs(79, 3, "got failure (" << errno << ")");
         error(true);
     } else {
         closed = false;
         ++store_open_disk_fd;
-        debugs(79, 3, HERE << ": opened FD " << fd);
+        debugs(79, 3, "opened FD " << fd);
     }
 
     callback->ioCompletedNotification();

diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h
index 527732e231ed0a3a52c316cf0e0e20acebf222b9..f6b062b042cfdc2ad47068a6d97d61e1e6b142f5 100644 (file)
--- a/src/DiskIO/AIO/AIODiskFile.h
+++ b/src/DiskIO/AIO/AIODiskFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/AIO/AIODiskIOModule.cc b/src/DiskIO/AIO/AIODiskIOModule.cc
index 7a63a530449768417b84e22b1b62dbf53265107b..4cd4553bd6deac92fadf9dab0d4437e75cead3b2 100644 (file)
--- a/src/DiskIO/AIO/AIODiskIOModule.cc
+++ b/src/DiskIO/AIO/AIODiskIOModule.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/AIO/AIODiskIOModule.h b/src/DiskIO/AIO/AIODiskIOModule.h
index 78e0960231842cc22dca6435d9ad917596b1aa69..c9b3e31219f4296408d7ba59b7df2e3f6de71408 100644 (file)
--- a/src/DiskIO/AIO/AIODiskIOModule.h
+++ b/src/DiskIO/AIO/AIODiskIOModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.cc b/src/DiskIO/AIO/AIODiskIOStrategy.cc
index cef90fe5438b8ad73a3ff3a1b3a093a83a22c854..58e0def4bcf67e7ec8924ab5cf272707037bb2ec 100644 (file)
--- a/src/DiskIO/AIO/AIODiskIOStrategy.cc
+++ b/src/DiskIO/AIO/AIODiskIOStrategy.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.h b/src/DiskIO/AIO/AIODiskIOStrategy.h
index daa7e4701e5680e533f477649d12dfd04cfdea4e..09f6f37701faf145e27b59e7e0a9a02840c2847c 100644 (file)
--- a/src/DiskIO/AIO/AIODiskIOStrategy.h
+++ b/src/DiskIO/AIO/AIODiskIOStrategy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/AIO/Makefile.am b/src/DiskIO/AIO/Makefile.am
index 59434f6e21bd2cac900f31bec7b9d3a6762fde8f..7480d23d823c8671f2f010dcf2aef7bfd51303d6 100644 (file)
--- a/src/DiskIO/AIO/Makefile.am
+++ b/src/DiskIO/AIO/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/DiskIO/AIO/aio_win32.cc b/src/DiskIO/AIO/aio_win32.cc
index 8055008e2d3fcb450c8a339a8013372809eaa97b..095a1ea5a34abb575989841a71fab48a1939f9f3 100644 (file)
--- a/src/DiskIO/AIO/aio_win32.cc
+++ b/src/DiskIO/AIO/aio_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/DiskIO/AIO/aio_win32.h b/src/DiskIO/AIO/aio_win32.h
index 0b93c95196d3a23edf26dd60551551f4c1a55736..b4bc7759e673e2585fb75ed2bbc7cbd873f88a2b 100644 (file)
--- a/src/DiskIO/AIO/aio_win32.h
+++ b/src/DiskIO/AIO/aio_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/DiskIO/AIO/async_io.h b/src/DiskIO/AIO/async_io.h
index 40f34b9ee8425045619a5c6d0d42e485710b8114..b075c487b8fbb9b859f21950a183250893125e98 100644 (file)
--- a/src/DiskIO/AIO/async_io.h
+++ b/src/DiskIO/AIO/async_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/DiskIO/Blocking/BlockingDiskIOModule.cc b/src/DiskIO/Blocking/BlockingDiskIOModule.cc
index 4480f297e162774d2ee89c65011960509443dac9..42a67be4351a4553d4d1c87fa88dd231e72bd0f7 100644 (file)
--- a/src/DiskIO/Blocking/BlockingDiskIOModule.cc
+++ b/src/DiskIO/Blocking/BlockingDiskIOModule.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Blocking/BlockingDiskIOModule.h b/src/DiskIO/Blocking/BlockingDiskIOModule.h
index 67e12997c4bd5a465966532064fee03902e292d2..86428552bbdc26b51dd15b095dff6d722d0fb6b9 100644 (file)
--- a/src/DiskIO/Blocking/BlockingDiskIOModule.h
+++ b/src/DiskIO/Blocking/BlockingDiskIOModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc
index f2e6155f85b14d56ce98ad7017a45d938dc2b1ba..839cdde82c1a7ee3ecee6d1a00d1e7bd48fb262a 100644 (file)
--- a/src/DiskIO/Blocking/BlockingFile.cc
+++ b/src/DiskIO/Blocking/BlockingFile.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -110,7 +110,7 @@ BlockingFile::read(ReadRequest *aRequest)
     assert (fd > -1);
     assert (ioRequestor.getRaw());
     readRequest = aRequest;
-    debugs(79, 3, HERE << aRequest->len << " for FD " << fd << " at " << aRequest->offset);
+    debugs(79, 3, aRequest->len << " for FD " << fd << " at " << aRequest->offset);
     file_read(fd, aRequest->buf, aRequest->len, aRequest->offset, ReadDone, this);
 }
 
@@ -125,7 +125,7 @@ BlockingFile::ReadDone(int fd, const char *buf, int len, int errflag, void *my_d
 void
 BlockingFile::write(WriteRequest *aRequest)
 {
-    debugs(79, 3, HERE << aRequest->len << " for FD " << fd << " at " << aRequest->offset);
+    debugs(79, 3, aRequest->len << " for FD " << fd << " at " << aRequest->offset);
     writeRequest = aRequest;
     file_write(fd,
                aRequest->offset,
@@ -181,7 +181,7 @@ void
 BlockingFile::writeDone(int rvfd, int errflag, size_t len)
 {
     assert (rvfd == fd);
-    debugs(79, 3, HERE << "FD " << fd << ", len " << len);
+    debugs(79, 3, "FD " << fd << ", len " << len);
 
     WriteRequest::Pointer result = writeRequest;
     writeRequest = NULL;

diff --git a/src/DiskIO/Blocking/BlockingFile.h b/src/DiskIO/Blocking/BlockingFile.h
index b3505d0092989591e509dcb111ae66e7b6ecdb1e..129d63c66d526dee47a1c4aca93246797bd7e783 100644 (file)
--- a/src/DiskIO/Blocking/BlockingFile.h
+++ b/src/DiskIO/Blocking/BlockingFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Blocking/BlockingIOStrategy.cc b/src/DiskIO/Blocking/BlockingIOStrategy.cc
index f1000dd53e9c402968674f0976462ec3a89499d8..2e5c2b5612d538c9d99f3a0159e51401800f6cfc 100644 (file)
--- a/src/DiskIO/Blocking/BlockingIOStrategy.cc
+++ b/src/DiskIO/Blocking/BlockingIOStrategy.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Blocking/BlockingIOStrategy.h b/src/DiskIO/Blocking/BlockingIOStrategy.h
index 29fc9814c5359624c0f99580e496ebe81a6bf39b..1cd9c0bd0c6c47f3a979739ee7aae1fd7f12bc38 100644 (file)
--- a/src/DiskIO/Blocking/BlockingIOStrategy.h
+++ b/src/DiskIO/Blocking/BlockingIOStrategy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Blocking/DiskIOBlocking.cc b/src/DiskIO/Blocking/DiskIOBlocking.cc
index 7548cffe5c29eb6343e771aa261f37fb88939cd2..e3b6a826bf18b3ceddc0a50e1d89b5bad12e39e4 100644 (file)
--- a/src/DiskIO/Blocking/DiskIOBlocking.cc
+++ b/src/DiskIO/Blocking/DiskIOBlocking.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Blocking/Makefile.am b/src/DiskIO/Blocking/Makefile.am
index 6a6a30ea3dda39fdc25669d8b98c377bbe5661b9..9bf4f2078df2a7842cc23b85eafb5eecbdd587d3 100644 (file)
--- a/src/DiskIO/Blocking/Makefile.am
+++ b/src/DiskIO/Blocking/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/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
index 53693396b2e853efe2b61aa4549c84d3d1300395..f6a790bbc245e24cf2c24ffad1737f1a989e72dc 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
+++ b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h
index 64a858241964002f606c51abb3474f34c18370bd..c5fb8dfe475ee0cb40ff90727fa30dae7175cc55 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h
+++ b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskDaemon/DiskdAction.cc b/src/DiskIO/DiskDaemon/DiskdAction.cc
index ff8d26458ee23e851071bb12adbff298d3b00036..bc1a83c10dc405be9e63c1c748e84e3fffeda649 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdAction.cc
+++ b/src/DiskIO/DiskDaemon/DiskdAction.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (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 @@ DiskdAction::Create(const Mgr::CommandPointer &aCmd)
 DiskdAction::DiskdAction(const Mgr::CommandPointer &aCmd):
     Action(aCmd), data()
 {
-    debugs(79, 5, HERE);
+    debugs(79, 5, MYNAME);
 }
 
 void
 DiskdAction::add(const Action& action)
 {
-    debugs(79, 5, HERE);
+    debugs(79, 5, MYNAME);
     data += dynamic_cast<const DiskdAction&>(action).data;
 }
 
@@ -114,7 +114,7 @@ DiskdAction::collect()
 void
 DiskdAction::dump(StoreEntry* entry)
 {
-    debugs(79, 5, HERE);
+    debugs(79, 5, MYNAME);
     Must(entry != NULL);
     storeAppendPrintf(entry, "sent_count: %.0f\n", data.sent_count);
     storeAppendPrintf(entry, "recv_count: %.0f\n", data.recv_count);

diff --git a/src/DiskIO/DiskDaemon/DiskdAction.h b/src/DiskIO/DiskDaemon/DiskdAction.h
index 3d07f1f376fd83c70309ab8e449dab40ec733d29..d25679524419b3e2b3c45381986562043d49b85b 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdAction.h
+++ b/src/DiskIO/DiskDaemon/DiskdAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskDaemon/DiskdFile.cc b/src/DiskIO/DiskDaemon/DiskdFile.cc
index 37894d52a3cdd1948c397b733f272466b36e60bd..ddb32248bd7856a28f21a9a2bcfd9ce232520f7b 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdFile.cc
+++ b/src/DiskIO/DiskDaemon/DiskdFile.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskDaemon/DiskdFile.h b/src/DiskIO/DiskDaemon/DiskdFile.h
index a885613762212d8c184e5b8de308f71967db8aca..2934498c83dc31e0e477db256db187497164828f 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdFile.h
+++ b/src/DiskIO/DiskDaemon/DiskdFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
index 3a9ce33041d813df9aba8e5996a457e6e1058d40..bdfe6d5ab438cbca9d03c8df4bc9fc543a03ca14 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.h b/src/DiskIO/DiskDaemon/DiskdIOStrategy.h
index 37d101dbd8c87337622830be233b8361477acab2..af7ba154a781beb19f353b76316a5f62e5482edb 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.h
+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskDaemon/Makefile.am b/src/DiskIO/DiskDaemon/Makefile.am
index 6e8fc3633b1a0dd12bbe6ffb99c28182226aa908..283208de67f9f45b270f8d860897c95c80353ef0 100644 (file)
--- a/src/DiskIO/DiskDaemon/Makefile.am
+++ b/src/DiskIO/DiskDaemon/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/DiskIO/DiskDaemon/diomsg.h b/src/DiskIO/DiskDaemon/diomsg.h
index 03743d62016495a4fb1cf48e6f0cb05d4b92e2d3..876050ad73a08e43ca0aafd537c45e87e0a9f174 100644 (file)
--- a/src/DiskIO/DiskDaemon/diomsg.h
+++ b/src/DiskIO/DiskDaemon/diomsg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskDaemon/diskd.cc b/src/DiskIO/DiskDaemon/diskd.cc
index e0588bba1fb0b1735277f5dbaccb904a6f0d7a56..ebba06b5d6dd461ace45313b7b3e7e666792d4a3 100644 (file)
--- a/src/DiskIO/DiskDaemon/diskd.cc
+++ b/src/DiskIO/DiskDaemon/diskd.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskFile.h b/src/DiskIO/DiskFile.h
index 87c66e87285f5e223f983e45e6876ef1cd845e84..4976f797e42c24987713bb22d286aec6252f3d30 100644 (file)
--- a/src/DiskIO/DiskFile.h
+++ b/src/DiskIO/DiskFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskIOModule.cc b/src/DiskIO/DiskIOModule.cc
index 9d6f64d04501f1a5992ad59a41c3f3a035b0558b..e023b2367e679c85fc8b19e0c2f9aabe179de12b 100644 (file)
--- a/src/DiskIO/DiskIOModule.cc
+++ b/src/DiskIO/DiskIOModule.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskIOModule.h b/src/DiskIO/DiskIOModule.h
index 2eb13a4a3e1c408fd0fcd2eb39c843de338679eb..3c22167d0eb21ef9e021559f4f5566f1cef3d63d 100644 (file)
--- a/src/DiskIO/DiskIOModule.h
+++ b/src/DiskIO/DiskIOModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskIOStrategy.h b/src/DiskIO/DiskIOStrategy.h
index 9e7a52be93ed9732351bbfe5c0243d9f3151af99..5e9afa6cb02e910da5b65e4a1d601bb1a6c5643c 100644 (file)
--- a/src/DiskIO/DiskIOStrategy.h
+++ b/src/DiskIO/DiskIOStrategy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskThreads/CommIO.cc b/src/DiskIO/DiskThreads/CommIO.cc
index 163bd5f943acc10054bcb41e62f6206cfd6f83c5..26803abd54f05a540f5eafb0af597887cc1c552c 100644 (file)
--- a/src/DiskIO/DiskThreads/CommIO.cc
+++ b/src/DiskIO/DiskThreads/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/DiskIO/DiskThreads/CommIO.h b/src/DiskIO/DiskThreads/CommIO.h
index 7f410413cebc59b77c6c0af62d2850c60410823e..e5895149af9635f6aa4976e66e42c6297167c62a 100644 (file)
--- a/src/DiskIO/DiskThreads/CommIO.h
+++ b/src/DiskIO/DiskThreads/CommIO.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskThreads/DiskThreads.h b/src/DiskIO/DiskThreads/DiskThreads.h
index ef385a40083710e2daa8049271bf705f083b1227..94871951a1d6efadcf92e78b7b01970500ba53ce 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreads.h
+++ b/src/DiskIO/DiskThreads/DiskThreads.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
index 7007b4c10133ea3eb711365fcf29eee93b57201d..6f552ab414566f9f11b47fafd11aa90c213e5d42 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -188,7 +188,7 @@ DiskThreadsDiskFile::close()
         ioRequestor->closeCompleted();
         return;
     } else {
-        debugs(79, DBG_CRITICAL, HERE << "DiskThreadsDiskFile::close: " <<
+        debugs(79, DBG_CRITICAL, "DiskThreadsDiskFile::close: " <<
                "did NOT close because ioInProgress() is true.  now what?");
     }
 }

diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
index b9c3ce37053ad840e32aca3652bb888f6e559b44..d2689585a0edcb84ee0940da2587025c2fb8527c 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc
index dc6f97ab3f274c16d41b0b7274b0324387286343..df406d4e19d59f3dfb517889a603ccf11475a950 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h
index ccdb195b5d5a76b81dae3cffc5bd7cb8e8323115..6653655f261dd509dfbc1e75349083b40462414c 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
index 3d9bf8b64657aa8a430cc629226eb608d30c0ef6..5b596ac8cd3a4dfcbf9af4e97a7374d3c6cf2439 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h
index 40a7f0b1b17e9550ea64c435ead8eb852b7b3dd1..7ebcf74d279865eac1670e8c20f76a4cfaf085b6 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h
+++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskThreads/Makefile.am b/src/DiskIO/DiskThreads/Makefile.am
index 56bb606bf771e4f94f91acfd4d1feb6b4dc22bef..7b42f9e19e4a52a2cc5329171fc0b0443267ecb6 100644 (file)
--- a/src/DiskIO/DiskThreads/Makefile.am
+++ b/src/DiskIO/DiskThreads/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/DiskIO/DiskThreads/aiops.cc b/src/DiskIO/DiskThreads/aiops.cc
index b6611ea8ec8a262fea46211bbfdbc4954b532a43..58c4dd7d74cd7915c5476abd9c876f15c07da329 100644 (file)
--- a/src/DiskIO/DiskThreads/aiops.cc
+++ b/src/DiskIO/DiskThreads/aiops.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/DiskThreads/aiops_win32.cc b/src/DiskIO/DiskThreads/aiops_win32.cc
index 79e415a3fc0cb394f7f9fc14f5ddc32258f3df80..9e30898e6e6618616bbea0f13588c28b4a80d154 100644 (file)
--- a/src/DiskIO/DiskThreads/aiops_win32.cc
+++ b/src/DiskIO/DiskThreads/aiops_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/DiskIO/DiskThreads/async_io.cc b/src/DiskIO/DiskThreads/async_io.cc
index b31f708129144295b9f165528a67f8ab8232a1f6..5bcad3777da8d6bbc369342d2f3d2805027b4b1d 100644 (file)
--- a/src/DiskIO/DiskThreads/async_io.cc
+++ b/src/DiskIO/DiskThreads/async_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/DiskIO/IORequestor.h b/src/DiskIO/IORequestor.h
index c844709357a13f8e979297533d0895e89291271c..b936794187cba1f8ac91c4023a2d20db50e6f8c6 100644 (file)
--- a/src/DiskIO/IORequestor.h
+++ b/src/DiskIO/IORequestor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc b/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc
index d103d890e777094ad8e1788b835b250f9e3f74f6..a38eca2d79aab5fd6d81724bf79a91f25f0110c4 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc
+++ b/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/IpcIo/IpcIoDiskIOModule.h b/src/DiskIO/IpcIo/IpcIoDiskIOModule.h
index 0484a91f2c561fb196e8f6f2d71985ab552f50d1..cd73930c1bd06bd5df2d525e37babb135df01e62 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoDiskIOModule.h
+++ b/src/DiskIO/IpcIo/IpcIoDiskIOModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc
index e0359aed8890bbf722baaef2f55d31f5bd7ed9d1..54e65275499304569693322118ca4822da49c16b 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoFile.cc
+++ b/src/DiskIO/IpcIo/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.
@@ -231,7 +231,7 @@ IpcIoFile::error() const
 void
 IpcIoFile::read(ReadRequest *readRequest)
 {
-    debugs(79,3, HERE << "(disker" << diskId << ", " << readRequest->len << ", " <<
+    debugs(79,3, "(disker" << diskId << ", " << readRequest->len << ", " <<
            readRequest->offset << ")");
 
     assert(ioRequestor != NULL);
@@ -252,7 +252,7 @@ IpcIoFile::readCompleted(ReadRequest *readRequest,
 {
     bool ioError = false;
     if (!response) {
-        debugs(79, 3, HERE << "error: timeout");
+        debugs(79, 3, "error: timeout");
         ioError = true; // I/O timeout does not warrant setting error_?
     } else {
         if (response->xerrno) {
@@ -279,7 +279,7 @@ IpcIoFile::readCompleted(ReadRequest *readRequest,
 void
 IpcIoFile::write(WriteRequest *writeRequest)
 {
-    debugs(79,3, HERE << "(disker" << diskId << ", " << writeRequest->len << ", " <<
+    debugs(79,3, "(disker" << diskId << ", " << writeRequest->len << ", " <<
            writeRequest->offset << ")");
 
     assert(ioRequestor != NULL);
@@ -321,7 +321,7 @@ IpcIoFile::writeCompleted(WriteRequest *writeRequest,
         (writeRequest->free_func)(const_cast<char*>(writeRequest->buf)); // broken API?
 
     if (!ioError) {
-        debugs(79,5, HERE << "wrote " << writeRequest->len << " to disker" <<
+        debugs(79,5, "wrote " << writeRequest->len << " to disker" <<
                diskId << " at " << writeRequest->offset);
     }
 
@@ -357,7 +357,7 @@ IpcIoFile::push(IpcIoPendingRequest *const pending)
         HandleResponses("before push");
     });
 
-    debugs(47, 7, HERE);
+    debugs(47, 7, MYNAME);
     Must(diskId >= 0);
     Must(pending);
     Must(pending->readRequest || pending->writeRequest);
@@ -386,7 +386,7 @@ IpcIoFile::push(IpcIoPendingRequest *const pending)
             memcpy(buf, pending->writeRequest->buf, ipcIo.len); // optimize away
         }
 
-        debugs(47, 7, HERE << "pushing " << SipcIo(KidIdentifier, ipcIo, diskId));
+        debugs(47, 7, "pushing " << SipcIo(KidIdentifier, ipcIo, diskId));
 
         // protect DiskerHandleRequest() from pop queue overflow
         if (pendingRequests() >= QueueCapacity)
@@ -442,7 +442,7 @@ IpcIoFile::canWait() const
             static_cast<time_msec_t>(expectedWait) < config.ioTimeout)
         return true; // expected wait time is acceptable
 
-    debugs(47,2, HERE << "cannot wait: " << expectedWait <<
+    debugs(47,2, "cannot wait: " << expectedWait <<
            " oldest: " << SipcIo(KidIdentifier, oldestIo, diskId));
     return false; // do not want to wait that long
 }
@@ -451,7 +451,7 @@ IpcIoFile::canWait() const
 void
 IpcIoFile::HandleOpenResponse(const Ipc::StrandMessage &response)
 {
-    debugs(47, 7, HERE << "coordinator response to open request");
+    debugs(47, 7, "coordinator response to open request");
     for (IpcIoFileList::iterator i = WaitingForOpen.begin();
             i != WaitingForOpen.end(); ++i) {
         if (response.strand.tag == (*i)->dbName) {
@@ -461,7 +461,7 @@ IpcIoFile::HandleOpenResponse(const Ipc::StrandMessage &response)
         }
     }
 
-    debugs(47, 4, HERE << "LATE disker response to open for " <<
+    debugs(47, 4, "LATE disker response to open for " <<
            response.strand.tag);
     // nothing we can do about it; completeIo() has been called already
 }
@@ -469,7 +469,7 @@ IpcIoFile::HandleOpenResponse(const Ipc::StrandMessage &response)
 void
 IpcIoFile::HandleResponses(const char *const when)
 {
-    debugs(47, 4, HERE << "popping all " << when);
+    debugs(47, 4, "popping all " << when);
     IpcIoMsg ipcIo;
     // get all responses we can: since we are not pushing, this will stop
     int diskId;
@@ -505,7 +505,7 @@ void
 IpcIoFile::Notify(const int peerId)
 {
     // TODO: Count and report the total number of notifications, pops, pushes.
-    debugs(47, 7, HERE << "kid" << peerId);
+    debugs(47, 7, "kid" << peerId);
     Ipc::TypedMsgHdr msg;
     msg.setType(Ipc::mtIpcIoNotification); // TODO: add proper message type?
     msg.putInt(KidIdentifier);
@@ -517,7 +517,7 @@ void
 IpcIoFile::HandleNotification(const Ipc::TypedMsgHdr &msg)
 {
     const int from = msg.getInt();
-    debugs(47, 7, HERE << "from " << from);
+    debugs(47, 7, "from " << from);
     queue->clearReaderSignal(from);
     if (IamDiskProcess())
         DiskerHandleRequests();
@@ -558,7 +558,7 @@ IpcIoFile::CheckTimeouts(void *const param)
 {
     Must(param);
     const int diskId = reinterpret_cast<uintptr_t>(param);
-    debugs(47, 7, HERE << "diskId=" << diskId);
+    debugs(47, 7, "diskId=" << diskId);
     const IpcIoFilesMap::const_iterator i = IpcIoFiles.find(diskId);
     if (i != IpcIoFiles.end())
         i->second->checkTimeouts();
@@ -715,7 +715,7 @@ diskerRead(IpcIoMsg &ipcIo)
 {
     if (!Ipc::Mem::GetPage(Ipc::Mem::PageId::ioPage, ipcIo.page)) {
         ipcIo.len = 0;
-        debugs(47,2, HERE << "run out of shared memory pages for IPC I/O");
+        debugs(47,2, "run out of shared memory pages for IPC I/O");
         return;
     }
 
@@ -727,13 +727,13 @@ diskerRead(IpcIoMsg &ipcIo)
     if (read >= 0) {
         ipcIo.xerrno = 0;
         const size_t len = static_cast<size_t>(read); // safe because read > 0
-        debugs(47,8, HERE << "disker" << KidIdentifier << " read " <<
+        debugs(47,8, "disker" << KidIdentifier << " read " <<
                (len == ipcIo.len ? "all " : "just ") << read);
         ipcIo.len = len;
     } else {
         ipcIo.xerrno = errno;
         ipcIo.len = 0;
-        debugs(47,5, HERE << "disker" << KidIdentifier << " read error: " <<
+        debugs(47,5, "disker" << KidIdentifier << " read error: " <<
                ipcIo.xerrno);
     }
 }
@@ -806,7 +806,7 @@ diskerWrite(IpcIoMsg &ipcIo)
 void
 IpcIoFile::DiskerHandleMoreRequests(void *source)
 {
-    debugs(47, 7, HERE << "resuming handling requests after " <<
+    debugs(47, 7, "resuming handling requests after " <<
            static_cast<const char *>(source));
     DiskerHandleMoreRequestsScheduled = false;
     IpcIoFile::DiskerHandleRequests();
@@ -844,7 +844,7 @@ IpcIoFile::WaitBeforePop()
     Ipc::QueueReader::Balance &balance = queue->localBalance();
     balance += static_cast<int64_t>(credit - debit);
 
-    debugs(47, 7, HERE << "rate limiting balance: " << balance << " after +" << credit << " -" << debit);
+    debugs(47, 7, "rate limiting balance: " << balance << " after +" << credit << " -" << debit);
 
     if (ipcIo.command == IpcIo::cmdWrite && balance > maxImbalance) {
         // if the next request is (likely) write and we accumulated
@@ -857,7 +857,7 @@ IpcIoFile::WaitBeforePop()
                    "I/O requests for " << (toSpend/1e3) << " seconds " <<
                    "to obey " << ioRate << "/sec rate limit");
 
-        debugs(47, 3, HERE << "rate limiting by " << toSpend << " ms to get" <<
+        debugs(47, 3, "rate limiting by " << toSpend << " ms to get" <<
                (1e3*maxRate) << "/sec rate");
         eventAdd("IpcIoFile::DiskerHandleMoreRequests",
                  &IpcIoFile::DiskerHandleMoreRequests,
@@ -903,7 +903,7 @@ IpcIoFile::DiskerHandleRequests()
                          minBreakSecs, 0, false);
                 DiskerHandleMoreRequestsScheduled = true;
             }
-            debugs(47, 3, HERE << "pausing after " << popped << " I/Os in " <<
+            debugs(47, 3, "pausing after " << popped << " I/Os in " <<
                    elapsedMsec << "ms; " << (elapsedMsec/popped) << "ms per I/O");
             break;
         }
@@ -926,7 +926,7 @@ IpcIoFile::DiskerHandleRequest(const int workerId, IpcIoMsg &ipcIo)
         return;
     }
 
-    debugs(47,5, HERE << "disker" << KidIdentifier <<
+    debugs(47,5, "disker" << KidIdentifier <<
            (ipcIo.command == IpcIo::cmdRead ? " reads " : " writes ") <<
            ipcIo.len << " at " << ipcIo.offset <<
            " ipcIo" << workerId << '.' << ipcIo.requestId);
@@ -941,7 +941,7 @@ IpcIoFile::DiskerHandleRequest(const int workerId, IpcIoMsg &ipcIo)
 
     assert(ipcIo.workerPid == workerPid);
 
-    debugs(47, 7, HERE << "pushing " << SipcIo(workerId, ipcIo, KidIdentifier));
+    debugs(47, 7, "pushing " << SipcIo(workerId, ipcIo, KidIdentifier));
 
     try {
         if (queue->push(workerId, ipcIo))
@@ -982,7 +982,7 @@ DiskerClose(const SBuf &path)
 {
     if (TheFile >= 0) {
         file_close(TheFile);
-        debugs(79,3, HERE << "rock db closed " << path << ": FD " << TheFile);
+        debugs(79,3, "rock db closed " << path << ": FD " << TheFile);
         TheFile = -1;
         --store_open_disk_fd;
     }

diff --git a/src/DiskIO/IpcIo/IpcIoFile.h b/src/DiskIO/IpcIo/IpcIoFile.h
index 00a5bd5428c4cc3ceb1e7f18af09110d719977ef..ddd2f70eadd1ec7cd07e298da9ccd4ddebb4bc5a 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoFile.h
+++ b/src/DiskIO/IpcIo/IpcIoFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/IpcIo/IpcIoIOStrategy.cc b/src/DiskIO/IpcIo/IpcIoIOStrategy.cc
index 2f65a14e9d09475753b036e5ca691934de2fd88b..bb214d83e4def504a657a269e063a243264be915 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoIOStrategy.cc
+++ b/src/DiskIO/IpcIo/IpcIoIOStrategy.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/IpcIo/IpcIoIOStrategy.h b/src/DiskIO/IpcIo/IpcIoIOStrategy.h
index 6877450a473299541410b531bf35b5fd23999f2d..7ba6b7acb8be142fb5f6098098bfa94270eb2864 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoIOStrategy.h
+++ b/src/DiskIO/IpcIo/IpcIoIOStrategy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/IpcIo/Makefile.am b/src/DiskIO/IpcIo/Makefile.am
index 38516c4e548b170068a4292ed173922c14bcd407..7198b9c6ffe109256dc916a7b87ada92f4fd230e 100644 (file)
--- a/src/DiskIO/IpcIo/Makefile.am
+++ b/src/DiskIO/IpcIo/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/DiskIO/Makefile.am b/src/DiskIO/Makefile.am
index cd2fe7b929d30e12214d88b6ae10ea1a57487c6b..e8c02f253c30e9403fd8cd8b4d49cd8478063ebe 100644 (file)
--- a/src/DiskIO/Makefile.am
+++ b/src/DiskIO/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/DiskIO/Mmapped/Makefile.am b/src/DiskIO/Mmapped/Makefile.am
index 1d1147aa364ec88a478885d5606d532ff7d430a4..1512f54a4beb3e05d92e04e68a9acca94ffb7df7 100644 (file)
--- a/src/DiskIO/Mmapped/Makefile.am
+++ b/src/DiskIO/Mmapped/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/DiskIO/Mmapped/MmappedDiskIOModule.cc b/src/DiskIO/Mmapped/MmappedDiskIOModule.cc
index 4f8b8c4d35a5f0e6baeaef03c1a641aa0e1a332c..20724769177dac0c09958d41af7b5c13cb288d16 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedDiskIOModule.cc
+++ b/src/DiskIO/Mmapped/MmappedDiskIOModule.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Mmapped/MmappedDiskIOModule.h b/src/DiskIO/Mmapped/MmappedDiskIOModule.h
index 8e37dff4706e4be762e1f5359cf3d692b871b1b9..574bf5b81a1bf8229775db31e2da7743ed19ce18 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedDiskIOModule.h
+++ b/src/DiskIO/Mmapped/MmappedDiskIOModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Mmapped/MmappedFile.cc b/src/DiskIO/Mmapped/MmappedFile.cc
index 7bfab6d0ca8017f890ae4537b2675df89712f1e3..2f29eeba6918dc1aee0fa1c46be91b3c3f3cb763 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedFile.cc
+++ b/src/DiskIO/Mmapped/MmappedFile.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (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 @@ MmappedFile::MmappedFile(char const *aPath): fd(-1),
 {
     assert(aPath);
     path_ = xstrdup(aPath);
-    debugs(79,5, HERE << this << ' ' << path_);
+    debugs(79,5, this << ' ' << path_);
 }
 
 MmappedFile::~MmappedFile()
@@ -117,7 +117,7 @@ void MmappedFile::doClose()
 void
 MmappedFile::close()
 {
-    debugs(79, 3, HERE << this << " closing for " << ioRequestor);
+    debugs(79, 3, this << " closing for " << ioRequestor);
     doClose();
     assert(ioRequestor != NULL);
     ioRequestor->closeCompleted();
@@ -144,7 +144,7 @@ MmappedFile::error() const
 void
 MmappedFile::read(ReadRequest *aRequest)
 {
-    debugs(79,3, HERE << "(FD " << fd << ", " << aRequest->len << ", " <<
+    debugs(79,3, "(FD " << fd << ", " << aRequest->len << ", " <<
            aRequest->offset << ")");
 
     assert(fd >= 0);
@@ -174,7 +174,7 @@ MmappedFile::read(ReadRequest *aRequest)
 void
 MmappedFile::write(WriteRequest *aRequest)
 {
-    debugs(79,3, HERE << "(FD " << fd << ", " << aRequest->len << ", " <<
+    debugs(79,3, "(FD " << fd << ", " << aRequest->len << ", " <<
            aRequest->offset << ")");
 
     assert(fd >= 0);
@@ -192,7 +192,7 @@ MmappedFile::write(WriteRequest *aRequest)
         debugs(79, DBG_IMPORTANT, "ERROR: " << xstrerr(errno));
         error_ = true;
     } else if (static_cast<size_t>(written) != aRequest->len) {
-        debugs(79, DBG_IMPORTANT, HERE << "problem: " << written << " < " << aRequest->len);
+        debugs(79, DBG_IMPORTANT, "problem: " << written << " < " << aRequest->len);
         error_ = true;
     }
 
@@ -200,7 +200,7 @@ MmappedFile::write(WriteRequest *aRequest)
         (aRequest->free_func)(const_cast<char*>(aRequest->buf)); // broken API?
 
     if (!error_) {
-        debugs(79,5, HERE << "wrote " << aRequest->len << " to FD " << fd << " at " << aRequest->offset);
+        debugs(79,5, "wrote " << aRequest->len << " to FD " << fd << " at " << aRequest->offset);
     } else {
         doClose();
     }
@@ -240,7 +240,7 @@ Mmapping::map()
 
     if (buf == MAP_FAILED) {
         const int errNo = errno;
-        debugs(79,3, HERE << "error FD " << fd << "mmap(" << length << '+' <<
+        debugs(79,3, "error FD " << fd << "mmap(" << length << '+' <<
                delta << ", " << offset << '-' << delta << "): " << xstrerr(errNo));
         buf = NULL;
         return NULL;
@@ -252,7 +252,7 @@ Mmapping::map()
 bool
 Mmapping::unmap()
 {
-    debugs(79,9, HERE << "FD " << fd <<
+    debugs(79,9, "FD " << fd <<
            " munmap(" << buf << ", " << length << '+' << delta << ')');
 
     if (!buf) // forgot or failed to map
@@ -261,7 +261,7 @@ Mmapping::unmap()
     const bool error = munmap(buf, length + delta) != 0;
     if (error) {
         const int errNo = errno;
-        debugs(79,3, HERE << "error FD " << fd <<
+        debugs(79,3, "error FD " << fd <<
                " munmap(" << buf << ", " << length << '+' << delta << "): " <<
                "): " << xstrerr(errNo));
     }

diff --git a/src/DiskIO/Mmapped/MmappedFile.h b/src/DiskIO/Mmapped/MmappedFile.h
index d271c9def757e7619ce9cb5a44e696cecd65deb3..c7c6796feebbdde3924a568801674c49499d40a9 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedFile.h
+++ b/src/DiskIO/Mmapped/MmappedFile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Mmapped/MmappedIOStrategy.cc b/src/DiskIO/Mmapped/MmappedIOStrategy.cc
index b824fef8309de123d240cd6c2e4c950636247dbc..2d3ec647ae33cced1a22107ef5925083d7e75c64 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedIOStrategy.cc
+++ b/src/DiskIO/Mmapped/MmappedIOStrategy.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/Mmapped/MmappedIOStrategy.h b/src/DiskIO/Mmapped/MmappedIOStrategy.h
index 51fc5c170b6dc1b10f933c82606370a481e6ae21..3479f187ee3d111d5f5b7bff30dfcfa3e1e5faa8 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedIOStrategy.h
+++ b/src/DiskIO/Mmapped/MmappedIOStrategy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/ReadRequest.cc b/src/DiskIO/ReadRequest.cc
index 237bbeabfc05079a2451758cf7cb2e00bf4a2c42..a5336a82458489d880429937e97b28e418836dfb 100644 (file)
--- a/src/DiskIO/ReadRequest.cc
+++ b/src/DiskIO/ReadRequest.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/ReadRequest.h b/src/DiskIO/ReadRequest.h
index 3f4606ad42b24cfc9e3f87dbd4685c8a4caf550e..9c57cc224f8e697cdf0a11665630c93030a2dd1d 100644 (file)
--- a/src/DiskIO/ReadRequest.h
+++ b/src/DiskIO/ReadRequest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/WriteRequest.cc b/src/DiskIO/WriteRequest.cc
index c7dfc8df289f21f2141f24be5091e6fab9aeac3d..5607d0611302b5e05d9c077979d40df27e868675 100644 (file)
--- a/src/DiskIO/WriteRequest.cc
+++ b/src/DiskIO/WriteRequest.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/DiskIO/WriteRequest.h b/src/DiskIO/WriteRequest.h
index 8ea54a5cd67964dce22124ec1a1c8a9f076253f8..9f3b60d69ee531b8c44fe25dbdec8cd4428de7a5 100644 (file)
--- a/src/DiskIO/WriteRequest.h
+++ b/src/DiskIO/WriteRequest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Downloader.cc b/src/Downloader.cc
index ba703ea1e95c485222e02a1c20926284502ab269..012387fb8ed5c321fabde1c8c7ff8b74174aed3a 100644 (file)
--- a/src/Downloader.cc
+++ b/src/Downloader.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Downloader.h b/src/Downloader.h
index 75e8857614d5c5ed36d0709133e741f95bbb4215..3dd24d2cc126aef25269afba2de315db34c804c2 100644 (file)
--- a/src/Downloader.h
+++ b/src/Downloader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ETag.cc b/src/ETag.cc
index 812579fa4a7e43740595406501232c56a5e3af40..aae6bd542964ee0159b83bbfce5a8d8fcdd35c6c 100644 (file)
--- a/src/ETag.cc
+++ b/src/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/ETag.h b/src/ETag.h
index 5d05e9d065d1f92aaf5ecfa0f55976b76f6c75c0..e73d58257eccbf756301e0dd17ea9d4a3619052b 100644 (file)
--- a/src/ETag.h
+++ b/src/ETag.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/EventLoop.cc b/src/EventLoop.cc
index 8fde2b103fef63c7b6371b959e3d8b86b3e74600..1f0e1bc3bbbd58e06d906431c4db0e05f6d1d7b6 100644 (file)
--- a/src/EventLoop.cc
+++ b/src/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/EventLoop.h b/src/EventLoop.h
index f389eb63425d41f186808111a17103975082dbe8..ad9081adfe2e2ae7c14d087aa0a583547a5e1716 100644 (file)
--- a/src/EventLoop.h
+++ b/src/EventLoop.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ExternalACL.h b/src/ExternalACL.h
index b0a5b81a95b8a66cec3fb6cc9900faa9ed16acef..1f6e74877741a04ee94be58927ad9a0f7c683091 100644 (file)
--- a/src/ExternalACL.h
+++ b/src/ExternalACL.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ExternalACLEntry.cc b/src/ExternalACLEntry.cc
index 67d7aff37db379656b7415ba4c5b89bf05490659..9417edea4ad8afb92c8e88225c57d672537702c1 100644 (file)
--- a/src/ExternalACLEntry.cc
+++ b/src/ExternalACLEntry.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ExternalACLEntry.h b/src/ExternalACLEntry.h
index 8f0a21c5dfd3746d862da9594c19c11825dc51a0..f04b60453c123e3a79808e83fd96a8557b082a0d 100644 (file)
--- a/src/ExternalACLEntry.h
+++ b/src/ExternalACLEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/FadingCounter.cc b/src/FadingCounter.cc
index 81a58f7551e6f1113127d8e2bf44f8cb6ab20d6b..a4ed353b346a51736ea1b7a7936f7da5339e2192 100644 (file)
--- a/src/FadingCounter.cc
+++ b/src/FadingCounter.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/FadingCounter.h b/src/FadingCounter.h
index 8547e9110fb3decc9f6afac1d8d87a5511370d24..e4cd7fa3d131cc12a9b05ed5d856151e0d791c60 100644 (file)
--- a/src/FadingCounter.h
+++ b/src/FadingCounter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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.h b/src/FileMap.h
index b94561ece3a424ea26c5af493963c999dd5077f8..3a6580f76df51598de7870d2d79977c21a617098 100644 (file)
--- a/src/FileMap.h
+++ b/src/FileMap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/FwdState.cc b/src/FwdState.cc
index 884e32363ee9155abe1e0130ce4b0f8bc7f509f9..3f2eedacc65a02a9c6c0117b9188fd390d805ad3 100644 (file)
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (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,7 +111,7 @@ FwdState::HandleStoreAbort(FwdState *fwd)
     if (Comm::IsConnOpen(fwd->serverConnection())) {
         fwd->closeServerConnection("store entry aborted");
     } else {
-        debugs(17, 7, HERE << "store entry aborted; no connection to close");
+        debugs(17, 7, "store entry aborted; no connection to close");
     }
     fwd->stopAndDestroy("store entry aborted");
 }
@@ -249,7 +249,7 @@ FwdState::selectPeerForIntercepted()
     p->remote = clientConn->local;
     getOutgoingAddress(request, p);
 
-    debugs(17, 3, HERE << "using client original destination: " << *p);
+    debugs(17, 3, "using client original destination: " << *p);
     destinations->addPath(p);
     destinations->destinationsFinalized = true;
     PeerSelectionInitiator::subscribed = false;
@@ -287,7 +287,7 @@ FwdState::completed()
     request->hier.stopPeerClock(false);
 
     if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
-        debugs(17, 3, HERE << "entry aborted");
+        debugs(17, 3, "entry aborted");
         return ;
     }
 
@@ -391,7 +391,7 @@ FwdState::Start(const Comm::ConnectionPointer &clientConn, StoreEntry *entry, Ht
         }
     }
 
-    debugs(17, 3, HERE << "'" << entry->url() << "'");
+    debugs(17, 3, "'" << entry->url() << "'");
     /*
      * This seems like an odd place to bind mem_obj and request.
      * Might want to assert that request is NULL at this point
@@ -476,7 +476,7 @@ FwdState::useDestinations()
             return; // expect a noteDestination*() call
         }
 
-        debugs(17, 3, HERE << "Connection failed: " << entry->url());
+        debugs(17, 3, "Connection failed: " << entry->url());
         if (!err) {
             const auto anErr = new ErrorState(ERR_CANNOT_FORWARD, Http::scInternalServerError, request, al);
             fail(anErr);
@@ -510,7 +510,7 @@ FwdState::reactToZeroSizeObject()
     assert(err->type == ERR_ZERO_SIZE_OBJECT);
 
     if (pconnRace == racePossible) {
-        debugs(17, 5, HERE << "pconn race happened");
+        debugs(17, 5, "pconn race happened");
         pconnRace = raceHappened;
         if (destinationReceipt) {
             destinations->reinstatePath(destinationReceipt);
@@ -530,7 +530,7 @@ FwdState::reactToZeroSizeObject()
 void
 FwdState::unregister(Comm::ConnectionPointer &conn)
 {
-    debugs(17, 3, HERE << entry->url() );
+    debugs(17, 3, entry->url() );
     assert(serverConnection() == conn);
     assert(Comm::IsConnOpen(conn));
     comm_remove_close_handler(conn->fd, closeHandler);
@@ -543,7 +543,7 @@ FwdState::unregister(Comm::ConnectionPointer &conn)
 void
 FwdState::unregister(int fd)
 {
-    debugs(17, 3, HERE << entry->url() );
+    debugs(17, 3, entry->url() );
     assert(fd == serverConnection()->fd);
     unregister(serverConn);
 }
@@ -716,7 +716,7 @@ FwdState::checkRetry()
         return false;
 
     if (!self) { // we have aborted before the server called us back
-        debugs(17, 5, HERE << "not retrying because of earlier abort");
+        debugs(17, 5, "not retrying because of earlier abort");
         // we will be destroyed when the server clears its Pointer to us
         return false;
     }
@@ -795,7 +795,7 @@ void
 FwdState::retryOrBail()
 {
     if (checkRetry()) {
-        debugs(17, 3, HERE << "re-forwarding (" << n_tries << " tries, " << (squid_curtime - start_t) << " secs)");
+        debugs(17, 3, "re-forwarding (" << n_tries << " tries, " << (squid_curtime - start_t) << " secs)");
         useDestinations();
         return;
     }
@@ -827,7 +827,7 @@ FwdState::doneWithRetries()
 void
 FwdState::handleUnregisteredServerEnd()
 {
-    debugs(17, 2, HERE << "self=" << self << " err=" << err << ' ' << entry->url());
+    debugs(17, 2, "self=" << self << " err=" << err << ' ' << entry->url());
     assert(!Comm::IsConnOpen(serverConn));
     serverConn = nullptr;
     destinationReceipt = nullptr;
@@ -1332,7 +1332,7 @@ FwdState::reforward()
     StoreEntry *e = entry;
 
     if (EBIT_TEST(e->flags, ENTRY_ABORTED)) {
-        debugs(17, 3, HERE << "entry aborted");
+        debugs(17, 3, "entry aborted");
         return 0;
     }
 
@@ -1343,7 +1343,7 @@ FwdState::reforward()
     e->mem_obj->checkUrlChecksum();
 #endif
 
-    debugs(17, 3, HERE << e->url() << "?" );
+    debugs(17, 3, e->url() << "?" );
 
     if (request->flags.pinned && !pinnedCanRetry()) {
         debugs(17, 3, "pinned connection; cannot retry");
@@ -1351,7 +1351,7 @@ FwdState::reforward()
     }
 
     if (!EBIT_TEST(e->flags, ENTRY_FWD_HDR_WAIT)) {
-        debugs(17, 3, HERE << "No, ENTRY_FWD_HDR_WAIT isn't set");
+        debugs(17, 3, "No, ENTRY_FWD_HDR_WAIT isn't set");
         return 0;
     }
 
@@ -1362,12 +1362,12 @@ FwdState::reforward()
         return 0;
 
     if (destinations->empty() && !PeerSelectionInitiator::subscribed) {
-        debugs(17, 3, HERE << "No alternative forwarding paths left");
+        debugs(17, 3, "No alternative forwarding paths left");
         return 0;
     }
 
     const auto s = entry->mem().baseReply().sline.status();
-    debugs(17, 3, HERE << "status " << s);
+    debugs(17, 3, "status " << s);
     return reforwardableStatus(s);
 }
 

diff --git a/src/FwdState.h b/src/FwdState.h
index 80294ffc1117105429bb9f31da7b10063cfb34a3..b7adbce7c5ea01d8566842e733f869d78cb9dcdf 100644 (file)
--- a/src/FwdState.h
+++ b/src/FwdState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Generic.h b/src/Generic.h
index dd4150c2f4d99078d1f90b7a769bb8de34e762b5..7c8276e2c8027e07c4147673b64660752ef8ccf2 100644 (file)
--- a/src/Generic.h
+++ b/src/Generic.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HappyConnOpener.cc b/src/HappyConnOpener.cc
index 9c5c097aeacc74bee19d6d4f85f834dd225237b8..bbcefc2b9d529f3338bc21a69d9fc033324c9367 100644 (file)
--- a/src/HappyConnOpener.cc
+++ b/src/HappyConnOpener.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HappyConnOpener.h b/src/HappyConnOpener.h
index b7e69630a0a3ee84d58cec6c4b471c27827fd6c1..cecbcb5892e1f293e6d25766ebd6d523ff002129 100644 (file)
--- a/src/HappyConnOpener.h
+++ b/src/HappyConnOpener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HierarchyLogEntry.h b/src/HierarchyLogEntry.h
index 0aed7010f1a469f97767a416c02a7161c0337d56..5fda661d73e1943262d814c5c500c0460d80dd30 100644 (file)
--- a/src/HierarchyLogEntry.h
+++ b/src/HierarchyLogEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpBody.cc b/src/HttpBody.cc
index cf5952eaa913d5a5cfa49e00459c03b1ce66e1eb..060a81d8cf31612ca9f40d6ac3e5b1e09bfd043c 100644 (file)
--- a/src/HttpBody.cc
+++ b/src/HttpBody.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpBody.h b/src/HttpBody.h
index 31d696c720545a09c11caab6d80d00665eae4d4e..07496696ecc25ac6b7b1757d1e99010d73c856d9 100644 (file)
--- a/src/HttpBody.h
+++ b/src/HttpBody.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpControlMsg.cc b/src/HttpControlMsg.cc
index 7aa9d8f9b70a0cfbbfda684e3e0d3472ae086268..60ef7c7ffdf1e5bf68473b6128080d5750ea6162 100644 (file)
--- a/src/HttpControlMsg.cc
+++ b/src/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/HttpControlMsg.h b/src/HttpControlMsg.h
index 55a612d168553f0061286050ae2c4103e122e5c0..e4de809618014bdebd28114ca5bd993913d1124d 100644 (file)
--- a/src/HttpControlMsg.h
+++ b/src/HttpControlMsg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc
index 0bc64ada1bbe04f22858cdf6df541408004c23ae..e0715f91ddc69b5fa57b5c9de293dc3f9d714eab 100644 (file)
--- a/src/HttpHdrCc.cc
+++ b/src/HttpHdrCc.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHdrCc.h b/src/HttpHdrCc.h
index c79518831473b00c1e6045fb54a184af71f1f5b3..21393217d83f6636c6327f223453741211d56c7f 100644 (file)
--- a/src/HttpHdrCc.h
+++ b/src/HttpHdrCc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHdrContRange.cc b/src/HttpHdrContRange.cc
index be07b4a3d7fbdbeb139dc9db299bb9389c5830be..8cd41518b4978b09a007d4ccf34d8364fd404dd3 100644 (file)
--- a/src/HttpHdrContRange.cc
+++ b/src/HttpHdrContRange.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHdrContRange.h b/src/HttpHdrContRange.h
index 0a92127aea842a7b5fecc7337fff8e0adac7bcc2..d7804d679f64830bf6d4b78d5a347f0a39e70cb9 100644 (file)
--- a/src/HttpHdrContRange.h
+++ b/src/HttpHdrContRange.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc
index 5c7a1ff6c4db84cbaf8745cb04259dc9c69b6833..4d41583ca8f719befe089421a86af22bd5e0eeb1 100644 (file)
--- a/src/HttpHdrRange.cc
+++ b/src/HttpHdrRange.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHdrSc.cc b/src/HttpHdrSc.cc
index eef5bf1e3e1b7667a18449fb26d70d0563e5719f..8d966b1ea9b3481fd34c97c411c2dc2f5154afc0 100644 (file)
--- a/src/HttpHdrSc.cc
+++ b/src/HttpHdrSc.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHdrSc.h b/src/HttpHdrSc.h
index 8ef9b9dd6da447993bb2c5e27d9a3e724cc5b763..1e5b049becc5be0f1b661b5340d4aaa74b81d692 100644 (file)
--- a/src/HttpHdrSc.h
+++ b/src/HttpHdrSc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHdrScTarget.cc b/src/HttpHdrScTarget.cc
index 6248d5a6a6e38b6d04c82789d47dd076588eeeda..9eef31cf6bb5bc1ef394fbead38406bb176f9368 100644 (file)
--- a/src/HttpHdrScTarget.cc
+++ b/src/HttpHdrScTarget.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHdrScTarget.h b/src/HttpHdrScTarget.h
index 60b8f2fa8bbff9982dfe35ff6b5c513cc4d6fc7a..021af5fb8867639a130530122689f4f6886545a0 100644 (file)
--- a/src/HttpHdrScTarget.h
+++ b/src/HttpHdrScTarget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index b590529b6d9d1cde6e6a4b5c27432d71bfc65181..4415f886e271ec503611d7ddd8cbe214e018a9f4 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/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/HttpHeader.h b/src/HttpHeader.h
index 99cb70733d0c96b6fa24a099d8093066df164867..c1bc69e27b99b19bbe40b9c00e44f465a3a7615a 100644 (file)
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHeaderFieldInfo.h b/src/HttpHeaderFieldInfo.h
index b55284f3160b5b2d98f70db0defd28ff2da2a891..9360b575ecfe592eb3c13560a1ef72a97199f71f 100644 (file)
--- a/src/HttpHeaderFieldInfo.h
+++ b/src/HttpHeaderFieldInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHeaderFieldStat.h b/src/HttpHeaderFieldStat.h
index 963f4cd4ee6c71417641ce3da0f79c94d7e74ca5..b1f57653640debe52e38c51035a416b0c4624a29 100644 (file)
--- a/src/HttpHeaderFieldStat.h
+++ b/src/HttpHeaderFieldStat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHeaderMask.h b/src/HttpHeaderMask.h
index 4afd889402d82f422be6854f85171cea05ccea0d..88cd9b457ae64dfd99e784265ddaecfa8c73197a 100644 (file)
--- a/src/HttpHeaderMask.h
+++ b/src/HttpHeaderMask.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHeaderRange.h b/src/HttpHeaderRange.h
index b9ae4e7b0235180db63e91a390d7a3163321a754..ad14b39d7cc0bbd3ffc94a21bcea423f2efdcaeb 100644 (file)
--- a/src/HttpHeaderRange.h
+++ b/src/HttpHeaderRange.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHeaderStat.h b/src/HttpHeaderStat.h
index f836605f70d10d4186d6627783c258f664fc72f7..95ad3935a3d7cd50ade03c60b92d291eb8231627 100644 (file)
--- a/src/HttpHeaderStat.h
+++ b/src/HttpHeaderStat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index 82f0dfc180e5fb829e520904411f0103b925602a..b52fb5726f9f1f53d70a44252d5a4d4dcc8e12b2 100644 (file)
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (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 @@ httpHeaderParseQuotedString(const char *start, const int len, String *val)
     const char *end, *pos;
     val->clean();
     if (*start != '"') {
-        debugs(66, 2, HERE << "failed to parse a quoted-string header field near '" << start << "'");
+        debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
         return 0;
     }
     pos = start + 1;
@@ -179,7 +179,7 @@ httpHeaderParseQuotedString(const char *start, const int len, String *val)
         if (*pos =='\r') {
             ++pos;
             if ((pos-start) > len || *pos != '\n') {
-                debugs(66, 2, HERE << "failed to parse a quoted-string header field with '\\r' octet " << (start-pos)
+                debugs(66, 2, "failed to parse a quoted-string header field with '\\r' octet " << (start-pos)
                        << " bytes into '" << start << "'");
                 val->clean();
                 return 0;
@@ -189,14 +189,14 @@ httpHeaderParseQuotedString(const char *start, const int len, String *val)
         if (*pos == '\n') {
             ++pos;
             if ( (pos-start) > len || (*pos != ' ' && *pos != '\t')) {
-                debugs(66, 2, HERE << "failed to parse multiline quoted-string header field '" << start << "'");
+                debugs(66, 2, "failed to parse multiline quoted-string header field '" << start << "'");
                 val->clean();
                 return 0;
             }
             // TODO: replace the entire LWS with a space
             val->append(" ");
             ++pos;
-            debugs(66, 2, HERE << "len < pos-start => " << len << " < " << (pos-start));
+            debugs(66, 2, "len < pos-start => " << len << " < " << (pos-start));
             continue;
         }
 
@@ -204,7 +204,7 @@ httpHeaderParseQuotedString(const char *start, const int len, String *val)
         if (quoted) {
             ++pos;
             if (!*pos || (pos-start) > len) {
-                debugs(66, 2, HERE << "failed to parse a quoted-string header field near '" << start << "'");
+                debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
                 val->clean();
                 return 0;
             }
@@ -213,7 +213,7 @@ httpHeaderParseQuotedString(const char *start, const int len, String *val)
         while (end < (start+len) && *end != '\\' && *end != '\"' && (unsigned char)*end > 0x1F && *end != 0x7F)
             ++end;
         if (((unsigned char)*end <= 0x1F && *end != '\r' && *end != '\n') || *end == 0x7F) {
-            debugs(66, 2, HERE << "failed to parse a quoted-string header field with CTL octet " << (start-pos)
+            debugs(66, 2, "failed to parse a quoted-string header field with CTL octet " << (start-pos)
                    << " bytes into '" << start << "'");
             val->clean();
             return 0;
@@ -223,7 +223,7 @@ httpHeaderParseQuotedString(const char *start, const int len, String *val)
     }
 
     if (*pos != '\"') {
-        debugs(66, 2, HERE << "failed to parse a quoted-string header field which did not end with \" ");
+        debugs(66, 2, "failed to parse a quoted-string header field which did not end with \" ");
         val->clean();
         return 0;
     }

diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h
index 77fb6c2c97a1a223128cbc83435101d53595220f..d017dfe5701c85043df6c8d00aa0a5ecd1b17fb5 100644 (file)
--- a/src/HttpHeaderTools.h
+++ b/src/HttpHeaderTools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index 2d5614525572f96dacd6319afb2a2bbd879bb9ca..2c34f9f7ed30648ceaa60d080011741b4d3b8e12 100644 (file)
--- a/src/HttpReply.cc
+++ b/src/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.
@@ -517,7 +517,7 @@ bool
 HttpReply::receivedBodyTooLarge(HttpRequest& request, int64_t receivedSize)
 {
     calcMaxBodySize(request);
-    debugs(58, 3, HERE << receivedSize << " >? " << bodySizeMax);
+    debugs(58, 3, receivedSize << " >? " << bodySizeMax);
     return bodySizeMax >= 0 && receivedSize > bodySizeMax;
 }
 
@@ -525,7 +525,7 @@ bool
 HttpReply::expectedBodyTooLarge(HttpRequest& request)
 {
     calcMaxBodySize(request);
-    debugs(58, 7, HERE << "bodySizeMax=" << bodySizeMax);
+    debugs(58, 7, "bodySizeMax=" << bodySizeMax);
 
     if (bodySizeMax < 0) // no body size limit
         return false;
@@ -534,7 +534,7 @@ HttpReply::expectedBodyTooLarge(HttpRequest& request)
     if (!expectingBody(request.method, expectedSize))
         return false;
 
-    debugs(58, 6, HERE << expectedSize << " >? " << bodySizeMax);
+    debugs(58, 6, expectedSize << " >? " << bodySizeMax);
 
     if (expectedSize < 0) // expecting body of an unknown length
         return false;
@@ -561,7 +561,7 @@ HttpReply::calcMaxBodySize(HttpRequest& request) const
     for (AclSizeLimit *l = Config.ReplyBodySize; l; l = l -> next) {
         /* if there is no ACL list or if the ACLs listed match use this size value */
         if (!l->aclList || ch.fastCheck(l->aclList).allowed()) {
-            debugs(58, 4, HERE << "bodySizeMax=" << bodySizeMax);
+            debugs(58, 4, "bodySizeMax=" << bodySizeMax);
             bodySizeMax = l->size; // may be -1
             break;
         }

diff --git a/src/HttpReply.h b/src/HttpReply.h
index c993fd10b5640d17e3f72f82d23efe6decccb2ed..2fbcecf7aac7962dceb6897797ba9f38c8e8f67f 100644 (file)
--- a/src/HttpReply.h
+++ b/src/HttpReply.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index f4bc42a507af3c97c7014c3aa3a2443a4ff2e8c2..5d43aee163f03b5b4ecec7a7eaf4c6d7cb61c032 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/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.
@@ -54,7 +54,7 @@ HttpRequest::HttpRequest(const HttpRequestMethod& aMethod, AnyP::ProtocolType aP
 {
     assert(mx);
     static unsigned int id = 1;
-    debugs(93,7, HERE << "constructed, this=" << this << " id=" << ++id);
+    debugs(93,7, "constructed, this=" << this << " id=" << ++id);
     init();
     initHTTP(aMethod, aProtocol, aSchemeImg, aUrlpath);
 }
@@ -62,7 +62,7 @@ HttpRequest::HttpRequest(const HttpRequestMethod& aMethod, AnyP::ProtocolType aP
 HttpRequest::~HttpRequest()
 {
     clean();
-    debugs(93,7, HERE << "destructed, this=" << this);
+    debugs(93,7, "destructed, this=" << this);
 }
 
 void
@@ -273,7 +273,7 @@ HttpRequest::sanityCheckStartLine(const char *buf, const size_t hdr_len, Http::S
     if (hdr_len < 2) {
         // this is only a real error if the headers apparently complete.
         if (hdr_len > 0) {
-            debugs(58, 3, HERE << "Too large request header (" << hdr_len << " bytes)");
+            debugs(58, 3, "Too large request header (" << hdr_len << " bytes)");
             *scode = Http::scInvalidHeader;
         }
         return false;
@@ -392,7 +392,7 @@ HttpRequest::icapHistory() const
     if (!icapHistory_) {
         if (Log::TheConfig.hasIcapToken || IcapLogfileStatus == LOG_ENABLE) {
             icapHistory_ = new Adaptation::Icap::History();
-            debugs(93,4, HERE << "made " << icapHistory_ << " for " << this);
+            debugs(93,4, "made " << icapHistory_ << " for " << this);
         }
     }
 
@@ -406,7 +406,7 @@ HttpRequest::adaptHistory(bool createIfNone) const
 {
     if (!adaptHistory_ && createIfNone) {
         adaptHistory_ = new Adaptation::History();
-        debugs(93,4, HERE << "made " << adaptHistory_ << " for " << this);
+        debugs(93,4, "made " << adaptHistory_ << " for " << this);
     }
 
     return adaptHistory_;

diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 820f4f01de13a3cbbca076cbc6761f0af8cb0bec..3eaf2ac5e720b647c269f9e2fb8308cbc0a16cf8 100644 (file)
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/HttpUpgradeProtocolAccess.cc b/src/HttpUpgradeProtocolAccess.cc
index fe4bedc0e010a307a0785ef914a222430ab51f6a..eb8146f7c36f7c611e00809f80be51fe14c78c4c 100644 (file)
--- a/src/HttpUpgradeProtocolAccess.cc
+++ b/src/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/HttpUpgradeProtocolAccess.h b/src/HttpUpgradeProtocolAccess.h
index 1e84f5ffce8e934bc1f0f70ebc05489c699c798b..7be5a8f74e954b80fe6614a0c352a00ed28509b7 100644 (file)
--- a/src/HttpUpgradeProtocolAccess.h
+++ b/src/HttpUpgradeProtocolAccess.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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.h b/src/ICP.h
index 8a53b657f6a9606ac86976ba2825341a6bc6b426..c0e898d97f2cb319019e38d2e5aa9a85132c4933 100644 (file)
--- a/src/ICP.h
+++ b/src/ICP.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Instance.cc b/src/Instance.cc
index 7ddbaf6367637039a914b412a9e60017e380abb9..7c8305e929734b40001a4f4ca0fab8501ac2905a 100644 (file)
--- a/src/Instance.cc
+++ b/src/Instance.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Instance.h b/src/Instance.h
index 90030f5888f6739206b67dbb3641eb6d18a5a03d..4a6df06fe4ed9ef0dd1abcd8adbb748ca9f40358 100644 (file)
--- a/src/Instance.h
+++ b/src/Instance.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/IoStats.h b/src/IoStats.h
index e04deef0251719e61878eb58e4344a2d7f881e46..96f64f523cc2d920428b35c8123fedb1b4dec5b2 100644 (file)
--- a/src/IoStats.h
+++ b/src/IoStats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/LoadableModule.cc b/src/LoadableModule.cc
index 186c4148ee3ebe6d76c2e0511a71f8f15302b299..1370db0db83caa883fbd2b215987c1496dee8321 100644 (file)
--- a/src/LoadableModule.cc
+++ b/src/LoadableModule.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/LoadableModule.h b/src/LoadableModule.h
index 953722ef7704d10ad694a38c1c7fa583cdb75093..2b8ec2a1bf1153db177354807360289d01b199a8 100644 (file)
--- a/src/LoadableModule.h
+++ b/src/LoadableModule.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/LoadableModules.cc b/src/LoadableModules.cc
index 16a6655555cceae79469f73aa93a072c16fe8d86..a2cd053bfdb258fb91d36d6c45c398e285a7b57e 100644 (file)
--- a/src/LoadableModules.cc
+++ b/src/LoadableModules.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/LoadableModules.h b/src/LoadableModules.h
index 0b94639123a923a4826775ada1cdaafa1bf04be8..61ab9879a64f246efe5bf55668778ed4fd74e861 100644 (file)
--- a/src/LoadableModules.h
+++ b/src/LoadableModules.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/LogTags.cc b/src/LogTags.cc
index 5e34d3c577dbc5be45437c39f993877e344a8002..29ed70e482a8fc731b74e386dcdbd3a44c6c4812 100644 (file)
--- a/src/LogTags.cc
+++ b/src/LogTags.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/LogTags.h b/src/LogTags.h
index f47c87acd49966ab977489706e18010d19afba78..9b3a276a9b2f3a489c3052ba3e0e8976058a7977 100644 (file)
--- a/src/LogTags.h
+++ b/src/LogTags.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Makefile.am b/src/Makefile.am
index 2fdbc3af00023dad69f7941115b43d0bb3b4f8ed..26dc260d94583495979007d4ee98087d06e74b93 100644 (file)
--- a/src/Makefile.am
+++ b/src/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.
@@ -1100,7 +1100,6 @@ tests_testRock_SOURCES = \
        EventLoop.cc \
        FadingCounter.cc \
        FileMap.h \
-       tests/stub_fqdncache.cc \
        tests/stub_HelperChildConfig.cc \
        HttpBody.cc \
        HttpBody.h \
@@ -1168,6 +1167,7 @@ tests_testRock_SOURCES = \
        fde.cc \
        fde.h \
        filemap.cc \
+       tests/stub_fqdncache.cc \
        fs_io.cc \
        fs_io.h \
        tests/stub_http.cc \
@@ -1275,7 +1275,6 @@ tests_testUfs_SOURCES = \
        EventLoop.cc \
        FadingCounter.cc \
        FileMap.h \
-       tests/stub_fqdncache.cc \
        tests/stub_HelperChildConfig.cc \
        HttpBody.cc \
        HttpBody.h \
@@ -1343,6 +1342,7 @@ tests_testUfs_SOURCES = \
        fde.cc \
        fde.h \
        filemap.cc \
+       tests/stub_fqdncache.cc \
        fs_io.cc \
        fs_io.h \
        tests/stub_helper.cc \
@@ -1624,7 +1624,6 @@ tests_testDiskIO_SOURCES = \
        EventLoop.cc \
        FadingCounter.cc \
        FileMap.h \
-       tests/stub_fqdncache.cc \
        tests/stub_HelperChildConfig.cc \
        HttpBody.cc \
        HttpBody.h \
@@ -1694,6 +1693,7 @@ tests_testDiskIO_SOURCES = \
        fde.cc \
        fde.h \
        filemap.cc \
+       tests/stub_fqdncache.cc \
        fs_io.cc \
        fs_io.h \
        tests/stub_helper.cc \
@@ -2824,13 +2824,13 @@ tests_testConfigParser_SOURCES = \
        tests/testConfigParser.h
 nodist_tests_testConfigParser_SOURCES = \
        ConfigParser.cc \
+       tests/stub_SBuf.cc \
        String.cc \
        tests/stub_acl.cc \
        tests/stub_cache_cf.cc \
        tests/stub_debug.cc \
        tests/stub_fatal.cc \
-       tests/stub_libmem.cc \
-       tests/stub_SBuf.cc
+       tests/stub_libmem.cc
 tests_testConfigParser_LDADD = \
        base/libbase.la \
        $(LIBCPPUNIT_LIBS) \
@@ -2845,13 +2845,13 @@ tests_testEvent_SOURCES = \
        tests/testEvent.cc \
        tests/testEvent.h
 nodist_tests_testEvent_SOURCES = \
-       event.cc \
        MemBuf.cc \
+       tests/stub_SBuf.cc \
        tests/stub_cache_manager.cc \
        tests/stub_cbdata.cc \
        tests/stub_debug.cc \
+       event.cc \
        tests/stub_libmem.cc \
-       tests/stub_SBuf.cc \
        tests/stub_time.cc \
        tests/stub_tools.cc
 tests_testEvent_LDADD = \

diff --git a/src/MasterXaction.cc b/src/MasterXaction.cc
index 29ffa292f14a133b3082648b1bffbc4bd0ca616b..5b9995c1236005493aa56bfd83db92b3de750a8c 100644 (file)
--- a/src/MasterXaction.cc
+++ b/src/MasterXaction.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/MasterXaction.h b/src/MasterXaction.h
index 1780b81c2293221a444d9047c91ab08cac85c263..277a1b8b97918bef9d2ad491c59f2ffd36eed5f4 100644 (file)
--- a/src/MasterXaction.h
+++ b/src/MasterXaction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index 2b96b83f9d9963fdce99ea0a6950175238ad8d4c..7d607d58dca053892d4255e891c8a525bb21ca75 100644 (file)
--- a/src/MemBuf.cc
+++ b/src/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/MemBuf.h b/src/MemBuf.h
index 87933b8eb782590fcd896f4c04264cb20355764c..356b8f4c6f07dfd2c43e6fa562130c7ca7788a22 100644 (file)
--- a/src/MemBuf.h
+++ b/src/MemBuf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/MemObject.cc b/src/MemObject.cc
index 4fef3e95c8d77fe555a801587a67c1b848775ef7..6ac49c2fb13d7b0f0d334b11fe4d3c22ab1f44da 100644 (file)
--- a/src/MemObject.cc
+++ b/src/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/MemObject.h b/src/MemObject.h
index c2fa54e8bba23182b9f72b495c2360135c677cdb..1b9b6f0572fdf3c3656de41912670739e8a7b19f 100644 (file)
--- a/src/MemObject.h
+++ b/src/MemObject.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/MemStore.cc b/src/MemStore.cc
index 2b9d436d55e86858c84550ed25dbd278a8519a80..58ae76932645985f6e32b9e8109787ed5c50ed56 100644 (file)
--- a/src/MemStore.cc
+++ b/src/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.
@@ -582,7 +582,7 @@ MemStore::shouldCache(StoreEntry &e) const
     }
 
     if (!e.memoryCachable()) {
-        debugs(20, 7, HERE << "Not memory cachable: " << e);
+        debugs(20, 7, "Not memory cachable: " << e);
         return false; // will not cache due to entry state or properties
     }
 
@@ -598,7 +598,7 @@ MemStore::shouldCache(StoreEntry &e) const
     const int64_t loadedSize = e.mem_obj->endOffset();
     const int64_t ramSize = max(loadedSize, expectedSize);
     if (ramSize > maxObjectSize()) {
-        debugs(20, 5, HERE << "Too big max(" <<
+        debugs(20, 5, "Too big max(" <<
                loadedSize << ", " << expectedSize << "): " << e);
         return false; // will not cache due to cachable entry size limits
     }
@@ -609,7 +609,7 @@ MemStore::shouldCache(StoreEntry &e) const
     }
 
     if (!map) {
-        debugs(20, 5, HERE << "No map to mem-cache " << e);
+        debugs(20, 5, "No map to mem-cache " << e);
         return false;
     }
 
@@ -628,7 +628,7 @@ MemStore::startCaching(StoreEntry &e)
     sfileno index = 0;
     Ipc::StoreMapAnchor *slot = map->openForWriting(reinterpret_cast<const cache_key *>(e.key), index);
     if (!slot) {
-        debugs(20, 5, HERE << "No room in mem-cache map to index " << e);
+        debugs(20, 5, "No room in mem-cache map to index " << e);
         return false;
     }
 

diff --git a/src/MemStore.h b/src/MemStore.h
index aebf8e4953c187ad9768cfa5123cdda7abb51d9e..306dc323d0c5ed02a678b1055a5b5e222f95e8a8 100644 (file)
--- a/src/MemStore.h
+++ b/src/MemStore.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/MessageBucket.cc b/src/MessageBucket.cc
index b7f7993eaefdd95a79271b36a74b6d48d14ab4ac..1cfd7535f8f5b8560c03001f433c90348f15449f 100644 (file)
--- a/src/MessageBucket.cc
+++ b/src/MessageBucket.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/MessageBucket.h b/src/MessageBucket.h
index 969fb15e97b2fdb6b7efa83bf8938bc115da2d39..524001d703739dc9fd81acf8c416932e48e2a631 100644 (file)
--- a/src/MessageBucket.h
+++ b/src/MessageBucket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/MessageDelayPools.cc b/src/MessageDelayPools.cc
index 28f5615d78c9fdb4781874b7a75c22a3b1a77bef..8258c6e77d667a25d0c1d60ca9b39efe446b3044 100644 (file)
--- a/src/MessageDelayPools.cc
+++ b/src/MessageDelayPools.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/MessageDelayPools.h b/src/MessageDelayPools.h
index e7de6c52ca2d34cf234ca6b96c413c359605fa6b..36bf64abf5d82aa426cb84871d0ff845ce4f0576 100644 (file)
--- a/src/MessageDelayPools.h
+++ b/src/MessageDelayPools.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/MessageSizes.h b/src/MessageSizes.h
index 2bf1584b1b1b7916cd565c018c8808712a8191e9..0b2f1e79510d51f4000938546feff38558a3f199 100644 (file)
--- a/src/MessageSizes.h
+++ b/src/MessageSizes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/NeighborTypeDomainList.h b/src/NeighborTypeDomainList.h
index faf518a96b5be78d7e9dc0c9d38ff2197badb982..88f1955d19d761809262d9e1c1ee578e6070c4bf 100644 (file)
--- a/src/NeighborTypeDomainList.h
+++ b/src/NeighborTypeDomainList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Notes.cc b/src/Notes.cc
index 9555eb88413ecb81296a4026ebc288472cf3c40c..809578ee126a8bb25e115b7b74027b9442f2b349 100644 (file)
--- a/src/Notes.cc
+++ b/src/Notes.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Notes.h b/src/Notes.h
index 45b60ceb4f9b8473fbe26963c92ef0bcd5539564..46e27e2342aaf9c062955ac5cb7341db51df6904 100644 (file)
--- a/src/Notes.h
+++ b/src/Notes.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/NullDelayId.h b/src/NullDelayId.h
index 5db3eb1aec5aa605d07db0832e964378fc5a6535..1e1ab192bb4d53d8d91d09c87db4d2e97b84c4b4 100644 (file)
--- a/src/NullDelayId.h
+++ b/src/NullDelayId.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Parsing.cc b/src/Parsing.cc
index 5dfd3cf9b461985c9d2b17d83902cf049d58e8b6..89396f40ef8d0766df884d1e59fcd9a3c2a382c7 100644 (file)
--- a/src/Parsing.cc
+++ b/src/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/Parsing.h b/src/Parsing.h
index 4b50f00fa7be7efca95d1ac824e6df22d68f2429..8451c9fbc46b9274dc9e8a734440a39b4ea85750 100644 (file)
--- a/src/Parsing.h
+++ b/src/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/PeerDigest.h b/src/PeerDigest.h
index b00fc81e82de94c892589546c82372bd6fd4622e..6532ffa40f38ace25b68daff687f0a9c512d590f 100644 (file)
--- a/src/PeerDigest.h
+++ b/src/PeerDigest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/PeerPoolMgr.cc b/src/PeerPoolMgr.cc
index f34d8584990696cca1a30da87e39adfb871e247b..69970ff7b5245a8b7f7b262f11fd4952eba94b56 100644 (file)
--- a/src/PeerPoolMgr.cc
+++ b/src/PeerPoolMgr.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/PeerPoolMgr.h b/src/PeerPoolMgr.h
index 182dc203c7667afe0891d1fa456b2d16f2433bf1..6da61b10bc0a4d8e509bab133695b62c87a544a2 100644 (file)
--- a/src/PeerPoolMgr.h
+++ b/src/PeerPoolMgr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/PeerSelectState.h b/src/PeerSelectState.h
index a59ef0f3f9c3484055cb8588615f493f3e8c93fa..914b2c9bca6157949b94e5ba538d30bd188b50cd 100644 (file)
--- a/src/PeerSelectState.h
+++ b/src/PeerSelectState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/PingData.h b/src/PingData.h
index 3ede159ff086eb1c68da879376463a148cffb53b..f2696d46ac0c50c57473b46fd5923b3a5740f4b4 100644 (file)
--- a/src/PingData.h
+++ b/src/PingData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Pipeline.cc b/src/Pipeline.cc
index 03e99f6542e1ea3530f69acc01c1fff3e5a99bf9..a557ff3114fa54419da472af437ecaf2353183dd 100644 (file)
--- a/src/Pipeline.cc
+++ b/src/Pipeline.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Pipeline.h b/src/Pipeline.h
index 5c2d56bc1dffc1a7584b473c7bd3655fc145f3d4..e3d803411622b91a95f6df240451fd015a883318 100644 (file)
--- a/src/Pipeline.h
+++ b/src/Pipeline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/RefreshPattern.h b/src/RefreshPattern.h
index 050bb3d7dd4fa6cbc9f061f94b6b6b8e40235468..2aa5c24085919e27c04e3deeb6b2e5df57b86507 100644 (file)
--- a/src/RefreshPattern.h
+++ b/src/RefreshPattern.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/RemovalPolicy.cc b/src/RemovalPolicy.cc
index 72764a53a91f2824e662eafebc3a3b70dc981600..d24172d25f1cf409aa0cf5b478da1073c8c6a218 100644 (file)
--- a/src/RemovalPolicy.cc
+++ b/src/RemovalPolicy.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/RemovalPolicy.h b/src/RemovalPolicy.h
index 01d0e30e807019490aa87a51ff87ab3ab58d0512..498e834c05ebad47953e013802f0b2c6f38fc989 100644 (file)
--- a/src/RemovalPolicy.h
+++ b/src/RemovalPolicy.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/RequestFlags.cc b/src/RequestFlags.cc
index bbd5aecfe3325f8c46891b766b9bd9749c8911dc..97a3a5020e9fa5972008456f1ea928d4d54cb45f 100644 (file)
--- a/src/RequestFlags.cc
+++ b/src/RequestFlags.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/RequestFlags.h b/src/RequestFlags.h
index 6f705eb95eb26bf6e05b925aa34eafcddbe8c28b..a26a4ea4dd759e69ab5cb7095b35a58381cb74e5 100644 (file)
--- a/src/RequestFlags.h
+++ b/src/RequestFlags.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ResolvedPeers.cc b/src/ResolvedPeers.cc
index 377dcee45120989b70d11e101ff2006a9afb0870..06ab02d23ad507395ea2e5a8841a52f4836f2baf 100644 (file)
--- a/src/ResolvedPeers.cc
+++ b/src/ResolvedPeers.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/ResolvedPeers.h b/src/ResolvedPeers.h
index e11e1f9120e5b86883a5194186b23ed313a8ef5b..4ee10cb8504b0ff3fa886ff852ae564d23e983e4 100644 (file)
--- a/src/ResolvedPeers.h
+++ b/src/ResolvedPeers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SBufStatsAction.cc b/src/SBufStatsAction.cc
index 45ac8a2571ded308e06452757631638850d08d3d..379c6f8ea48157e750041ec28a6aad84316cc6a1 100644 (file)
--- a/src/SBufStatsAction.cc
+++ b/src/SBufStatsAction.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SBufStatsAction.h b/src/SBufStatsAction.h
index c23104a68156fe3ec566cc0fca069ce5f59fec13..4ae3989659f2642459711a9cfa107ddf3995160e 100644 (file)
--- a/src/SBufStatsAction.h
+++ b/src/SBufStatsAction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SnmpRequest.h b/src/SnmpRequest.h
index 002ff61a3592d9addcc77d927fa76f8b289ae793..3bd7f9e5857161ef0f9b3f6d2715d6e24380452a 100644 (file)
--- a/src/SnmpRequest.h
+++ b/src/SnmpRequest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SquidConfig.cc b/src/SquidConfig.cc
index 13ebf2fcc3984bf8ffad4c668fd5ebdbe6d86a98..cbe068a747364390baefb0a630b765637473c8af 100644 (file)
--- a/src/SquidConfig.cc
+++ b/src/SquidConfig.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 491dc98dba9630854794c216defef074ae959d60..f13ff835fba0708db7d973c15cfc6fc1e9f2d285 100644 (file)
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SquidIpc.h b/src/SquidIpc.h
index 5d46ecd25d94b86b600522777ac8c0f19cd6a615..fdb6bb98284c5738efb988986c8ae7b7b9ebc13a 100644 (file)
--- a/src/SquidIpc.h
+++ b/src/SquidIpc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SquidMath.cc b/src/SquidMath.cc
index 4369f1c5f46cf294559ecdb4051b796cca52b5fd..cf7c800eece94c8702cf634153f29fe813986c5f 100644 (file)
--- a/src/SquidMath.cc
+++ b/src/SquidMath.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SquidMath.h b/src/SquidMath.h
index 49e056339ec680786dad172176197e95f216a679..acc2ec713ab47e4799893828e1353d9840568071 100644 (file)
--- a/src/SquidMath.h
+++ b/src/SquidMath.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SquidString.h b/src/SquidString.h
index 30f23285fee45136f6f5ee8277b2f2648fc37495..e36cd27295d8743c6d3e50cb9bd889030f6d0ff7 100644 (file)
--- a/src/SquidString.h
+++ b/src/SquidString.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/SquidTime.h b/src/SquidTime.h
index 125eb9c676b2652f5b981b444afbc0bb2fb90185..a938fc95070bcab7dcf35c7f079b65719ef634d3 100644 (file)
--- a/src/SquidTime.h
+++ b/src/SquidTime.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StatCounters.cc b/src/StatCounters.cc
index 366f4e496fb9f3fd4cfbfff8fb892cde6ca4644a..90c000eff0cb4b17b5771059668ebe703a8453c6 100644 (file)
--- a/src/StatCounters.cc
+++ b/src/StatCounters.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StatCounters.h b/src/StatCounters.h
index b085bc826f9fc9c69937f86f6fff5399b4d07b98..67f6a7f0326562b29db5a999dbea7fed9ead5374 100644 (file)
--- a/src/StatCounters.h
+++ b/src/StatCounters.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StatHist.cc b/src/StatHist.cc
index d439106cf63bfe74087834e29e36a8655539eb02..474fe7c60ed6bb28949f7b80cc87df1506a5aff9 100644 (file)
--- a/src/StatHist.cc
+++ b/src/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.

diff --git a/src/StatHist.h b/src/StatHist.h
index 3a5dd9cb381ce1eab53d530855d7be0020681d1d..b616c80988c90e2d00cf15ede3ba004709ff3036 100644 (file)
--- a/src/StatHist.h
+++ b/src/StatHist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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.h b/src/Store.h
index 5f19842d9c854f328c1025e8d2288f7febab09fc..937172448e9559415db383ccc0b67177fc1752c0 100644 (file)
--- a/src/Store.h
+++ b/src/Store.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreClient.h b/src/StoreClient.h
index 299a5b1473f92279abb44e83f40a71185052425a..4d34f231291ce8d55835cf824dc2010bfdaa3ddc 100644 (file)
--- a/src/StoreClient.h
+++ b/src/StoreClient.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreFileSystem.cc b/src/StoreFileSystem.cc
index fc5981b9f49e62db68425c2bff5ed9e84cc9dc22..02da8385bbd61d834b9390f6e620e23c0c711c0b 100644 (file)
--- a/src/StoreFileSystem.cc
+++ b/src/StoreFileSystem.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h
index 830529e2abb9709a750309c8e8c144693ab7f423..92738ce431dea5b0734fa7bb37fd6821a94f560f 100644 (file)
--- a/src/StoreFileSystem.h
+++ b/src/StoreFileSystem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreIOBuffer.h b/src/StoreIOBuffer.h
index 6699b6d5170c41117e19d797875fa10d5989a852..859eda6d340211774ba8582f978cfcceeaea5fb5 100644 (file)
--- a/src/StoreIOBuffer.h
+++ b/src/StoreIOBuffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreIOState.cc b/src/StoreIOState.cc
index 8bd9e0db8d1e4f5fe914528adcf05f0e1f3c19bd..93f3facf73b25d24fbdd1d6cf2b391069c51de40 100644 (file)
--- a/src/StoreIOState.cc
+++ b/src/StoreIOState.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreIOState.h b/src/StoreIOState.h
index a0869cee4c3fb85b6ac875973cdbddff6d5a4be8..d335f360746655af075317928119a9b7090abee3 100644 (file)
--- a/src/StoreIOState.h
+++ b/src/StoreIOState.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMeta.cc b/src/StoreMeta.cc
index 70741020ea87420fa2e89888f275d914a1fba802..eccecdf429e5dd4848ba1f003417096261dfda2b 100644 (file)
--- a/src/StoreMeta.cc
+++ b/src/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/StoreMeta.h b/src/StoreMeta.h
index 4d98ac520d0792419fe54ebc780c5db04763cf99..904d0e4db5a5ff459ae59bdedd79108b7e70bac6 100644 (file)
--- a/src/StoreMeta.h
+++ b/src/StoreMeta.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaMD5.cc b/src/StoreMetaMD5.cc
index 8f6a37da6d4e8acae3162c309475d9859b94cfbd..87c802d684aaa13ea965297b6e852300b36b26cd 100644 (file)
--- a/src/StoreMetaMD5.cc
+++ b/src/StoreMetaMD5.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaMD5.h b/src/StoreMetaMD5.h
index a491b93e99a141e80ddbafd51f43c30b2d593dc7..f980bae7df31f2ff0435c465e8fed5c824db6ca8 100644 (file)
--- a/src/StoreMetaMD5.h
+++ b/src/StoreMetaMD5.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaObjSize.h b/src/StoreMetaObjSize.h
index 5a22686951b8d0c8bb442e5611286b854fa23cb4..ad3499349fffbf775643de0d1d05cf27871f5fe9 100644 (file)
--- a/src/StoreMetaObjSize.h
+++ b/src/StoreMetaObjSize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaSTD.cc b/src/StoreMetaSTD.cc
index 208bcf49903f2318a76f687951aa0f9b021d31e0..28f144ba01caddd648973408d923548682888724 100644 (file)
--- a/src/StoreMetaSTD.cc
+++ b/src/StoreMetaSTD.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaSTD.h b/src/StoreMetaSTD.h
index ff9a0bfd02efa853a914027547e52edb3633fba6..8af92b46189f4576da2cc5b7646a8a249407cee3 100644 (file)
--- a/src/StoreMetaSTD.h
+++ b/src/StoreMetaSTD.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaSTDLFS.cc b/src/StoreMetaSTDLFS.cc
index 9023f288009268479a8435d5594429ce74dafcd8..475f453c8f4e9d04d4d5b713041ae779965c8d78 100644 (file)
--- a/src/StoreMetaSTDLFS.cc
+++ b/src/StoreMetaSTDLFS.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaSTDLFS.h b/src/StoreMetaSTDLFS.h
index fee50d140fe3287a7da3dbef315f1d47abb52340..e38663557467c09406a5bd4ed3b5035432cf97f3 100644 (file)
--- a/src/StoreMetaSTDLFS.h
+++ b/src/StoreMetaSTDLFS.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaURL.cc b/src/StoreMetaURL.cc
index 8ff6a7ea08a633ddc14bb04550db742e94d7cfbf..9718dc15250952f1885470c2af142099dd0939f3 100644 (file)
--- a/src/StoreMetaURL.cc
+++ b/src/StoreMetaURL.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaURL.h b/src/StoreMetaURL.h
index 1e5e414caf9e5c1787751e9ceba81329fdfdeeb1..660e6d545177e03343aa147603d206f0c2e8a8ab 100644 (file)
--- a/src/StoreMetaURL.h
+++ b/src/StoreMetaURL.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaUnpacker.cc b/src/StoreMetaUnpacker.cc
index 8c96627d509551eabd4ed5d8b9777c5c0c77f5d4..4d4ac3f8aebd15e86560bdb3d1e902b3945ba40a 100644 (file)
--- a/src/StoreMetaUnpacker.cc
+++ b/src/StoreMetaUnpacker.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaUnpacker.h b/src/StoreMetaUnpacker.h
index 749bb721e8057378ad325db39a5bb86c0da80744..9c5d360cacf58d3585e2f482a3eb074e3712f49e 100644 (file)
--- a/src/StoreMetaUnpacker.h
+++ b/src/StoreMetaUnpacker.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaVary.cc b/src/StoreMetaVary.cc
index 8a537c8a8f2f4278c731fb4c4c8d02bd9954f85e..f589518db0148909b1277cf6a0f813d0f6318c28 100644 (file)
--- a/src/StoreMetaVary.cc
+++ b/src/StoreMetaVary.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreMetaVary.h b/src/StoreMetaVary.h
index f2f2350cc7d643ea750b9640cfc5781e02d015a0..9cc5cb0925a15b3066fc01574573c17615441cca 100644 (file)
--- a/src/StoreMetaVary.h
+++ b/src/StoreMetaVary.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreSearch.h b/src/StoreSearch.h
index d1f7115faf1f7a2d32cb1504e06a521abd4e3e30..87052935eb02b563422d356a34ed648a704e1625 100644 (file)
--- a/src/StoreSearch.h
+++ b/src/StoreSearch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreStats.cc b/src/StoreStats.cc
index 175b8a2bb1f4fb1e300d73c54078980ae04b8614..fd1fa3b1815821c5b11a49b76f96cff15fc53d8f 100644 (file)
--- a/src/StoreStats.cc
+++ b/src/StoreStats.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreStats.h b/src/StoreStats.h
index c5c79286b0d26e93d987aa55aef4621754dbb23e..11addf78e433d61af9890f1b2961e3748af199fa 100644 (file)
--- a/src/StoreStats.h
+++ b/src/StoreStats.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreSwapLogData.cc b/src/StoreSwapLogData.cc
index 13bb158b1a6d2fe03ddd374cbcf6f7368213004f..66caad34feece3559837574cd8a274ca19bc158a 100644 (file)
--- a/src/StoreSwapLogData.cc
+++ b/src/StoreSwapLogData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StoreSwapLogData.h b/src/StoreSwapLogData.h
index a6a3c8db6c9fb0808865da5f4c097c54e64a8131..b1e33c024af424e88db82d7e6f1efd866676e628 100644 (file)
--- a/src/StoreSwapLogData.h
+++ b/src/StoreSwapLogData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StrList.cc b/src/StrList.cc
index 234e3fa3715b949bea7ecafab4eb9b0bc7bdb584..caf9ad9a0867fa7e88f3c841e8d19a658c5a20e3 100644 (file)
--- a/src/StrList.cc
+++ b/src/StrList.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/StrList.h b/src/StrList.h
index 18c4e23d2e5e6b9d5c30967aa5af7410a1eee1ee..11ee50b545ebab361b71542a190d8ad723223bb8 100644 (file)
--- a/src/StrList.h
+++ b/src/StrList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/String.cc b/src/String.cc
index 98b13336a53261acabc9f37a6326e28139e2026c..84744d1bf8889d8b07240dfb6f3a7bd70e1302e8 100644 (file)
--- a/src/String.cc
+++ b/src/String.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/TestHeaders.am b/src/TestHeaders.am
index a14eddf16f00d6972d134025f37e042c3067e783..b77f7578bdc1e5035e24712832f2404a22a602c4 100644 (file)
--- a/src/TestHeaders.am
+++ b/src/TestHeaders.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/TimeOrTag.h b/src/TimeOrTag.h
index e8c11607665374aa90294ed5a445abd285e240d2..be055cbc363f6ea9dd5de7cee7b43d723186b908 100644 (file)
--- a/src/TimeOrTag.h
+++ b/src/TimeOrTag.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Transients.cc b/src/Transients.cc
index 69b6de65c15dcc0e559fe51a84cdba1aedb4677f..a781589e732a168af9916bdaa79b89651cc7ef03 100644 (file)
--- a/src/Transients.cc
+++ b/src/Transients.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/Transients.h b/src/Transients.h
index 2ed566632b0cb8fd143a2a8524fc7aed85d19510..1d2e823d0919879b72313d4ab51cf1922b45fa63 100644 (file)
--- a/src/Transients.h
+++ b/src/Transients.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/WinSvc.cc b/src/WinSvc.cc
index 7c16cc7c06c3659f5565a0ef527db68d38d13530..bf937d6d64003ad9d3b9d50fb27aec30c9c89d80 100644 (file)
--- a/src/WinSvc.cc
+++ b/src/WinSvc.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/WinSvc.h b/src/WinSvc.h
index c101d40aeba5acb9055be5ede6b503674f8f4eaa..b1ccbb1a14541c8725ec7203e46bbb6fd5e74299 100644 (file)
--- a/src/WinSvc.h
+++ b/src/WinSvc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/XactionInitiator.cc b/src/XactionInitiator.cc
index e30ab4ac0da305b823ae19245ac1cf353a87908c..1805052a99785a83f3db2c67b84d310c75f1f759 100644 (file)
--- a/src/XactionInitiator.cc
+++ b/src/XactionInitiator.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/XactionInitiator.h b/src/XactionInitiator.h
index b766ab32b380164f5baf6673c2b2429e9c18e26e..ed2d6c8e73be4de7884671766de393d46c7ec579 100644 (file)
--- a/src/XactionInitiator.h
+++ b/src/XactionInitiator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.

diff --git a/src/XactionStep.h b/src/XactionStep.h
index 560f3e6e122d542a4225329137d5d04991276d69..b7df402954e5f53e3ff13cd26a274503b42cc04f 100644 (file)
--- a/src/XactionStep.h
+++ b/src/XactionStep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Acl.cc b/src/acl/Acl.cc
index b6f8d0e15f66ba8e2da5531a9bb3fdbc8d59017c..a70419a62f8e71d123da02912ccb1761c1f2f87b 100644 (file)
--- a/src/acl/Acl.cc
+++ b/src/acl/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/Acl.h b/src/acl/Acl.h
index a8b163ee105191dd42235a23304dc8db8371c9d5..8f07d96444a3036c41ecae9c72eb5da64b33328f 100644 (file)
--- a/src/acl/Acl.h
+++ b/src/acl/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/acl/AclDenyInfoList.h b/src/acl/AclDenyInfoList.h
index 35abd789a2ada291c79df55d1e40b57577d141be..2fe959c61ce7a91dddec32daa211d690eaf1a124 100644 (file)
--- a/src/acl/AclDenyInfoList.h
+++ b/src/acl/AclDenyInfoList.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AclSizeLimit.cc b/src/acl/AclSizeLimit.cc
index 3ccc1a2a6457d8c019c2dd5711406df7aacdbbd4..7a954afcde7331bbd720148820885ed5a2f07619 100644 (file)
--- a/src/acl/AclSizeLimit.cc
+++ b/src/acl/AclSizeLimit.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AclSizeLimit.h b/src/acl/AclSizeLimit.h
index 58c48be0212605c976fb3239847caca8791d31b4..290ef3fd13cf0f323070a3c12c56ebc22eba4f5c 100644 (file)
--- a/src/acl/AclSizeLimit.h
+++ b/src/acl/AclSizeLimit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AdaptationService.cc b/src/acl/AdaptationService.cc
index 5b418b5c136c5520d6cd5b2d67007a1500a27d3c..f99fb1b2cd9602f9c800bbfee6c3dfbb8f7ab90a 100644 (file)
--- a/src/acl/AdaptationService.cc
+++ b/src/acl/AdaptationService.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AdaptationService.h b/src/acl/AdaptationService.h
index ef6ae974d198a7b3f882e702ae9e4a473b63dde2..f44e48de1402d675b42b9281ed1ea5fcd186a2d2 100644 (file)
--- a/src/acl/AdaptationService.h
+++ b/src/acl/AdaptationService.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AdaptationServiceData.cc b/src/acl/AdaptationServiceData.cc
index e04f7fe002e65029cc6678686a70e5d4164a7b4b..0d58a9666c1e2c3edc6fa67b30943eb624540756 100644 (file)
--- a/src/acl/AdaptationServiceData.cc
+++ b/src/acl/AdaptationServiceData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AdaptationServiceData.h b/src/acl/AdaptationServiceData.h
index 59ab0828fd239eaa58360b017f701799e82ff100..acb6569300fa6ec2ac10f5e2f2e1b3eccc2a3b69 100644 (file)
--- a/src/acl/AdaptationServiceData.h
+++ b/src/acl/AdaptationServiceData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Address.cc b/src/acl/Address.cc
index 14037d4ee1da7f847241a7171897f8f4f4223642..abcb1d25eac3e946902f5cf647479fd0922ebad4 100644 (file)
--- a/src/acl/Address.cc
+++ b/src/acl/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.

diff --git a/src/acl/Address.h b/src/acl/Address.h
index 6df0e0690d8c2001c28a82b7c7020f29872f172b..fce62c6c835a62184f0dd47024a69b4a204f8608 100644 (file)
--- a/src/acl/Address.h
+++ b/src/acl/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/acl/AllOf.cc b/src/acl/AllOf.cc
index 65f5afc1c2e4e0f77d7b6ed090cae2d6c36e5977..579cdfbb20112e7a54adbad6234fa271ad636931 100644 (file)
--- a/src/acl/AllOf.cc
+++ b/src/acl/AllOf.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AllOf.h b/src/acl/AllOf.h
index 98b8346f3d48904afe4a7fd7b81003bfccb3addb..a85324ee15221bfd98fb5400641c66980cc91880 100644 (file)
--- a/src/acl/AllOf.h
+++ b/src/acl/AllOf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AnnotateClient.cc b/src/acl/AnnotateClient.cc
index 3701b1c032b486ffce3bb782ae73b75ca7e29217..15855e2e68a56f503ba3aca630994954a28670b8 100644 (file)
--- a/src/acl/AnnotateClient.cc
+++ b/src/acl/AnnotateClient.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AnnotateClient.h b/src/acl/AnnotateClient.h
index 702772ac0de8b1ba080de65f3b024e26c67257bd..139c80ff0257cc60062f74f5400a27817a41767a 100644 (file)
--- a/src/acl/AnnotateClient.h
+++ b/src/acl/AnnotateClient.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AnnotateTransaction.cc b/src/acl/AnnotateTransaction.cc
index 4f8f9796c6cb517a46f8392c0c8a0055d6d1b59e..2d2b0df0d573bf204894104e5af398a3d536374a 100644 (file)
--- a/src/acl/AnnotateTransaction.cc
+++ b/src/acl/AnnotateTransaction.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AnnotateTransaction.h b/src/acl/AnnotateTransaction.h
index 6392b0bedc6a2dc4c50bc9446f32955b05cb3c6f..0f6795c9baef0773bc4413390952c2636d1b7242 100644 (file)
--- a/src/acl/AnnotateTransaction.h
+++ b/src/acl/AnnotateTransaction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AnnotationData.cc b/src/acl/AnnotationData.cc
index 35f8894087fde1628ef3aa78b0dbc139ec653c26..b6ca990318db0b4c299ae718a270859b81033d2e 100644 (file)
--- a/src/acl/AnnotationData.cc
+++ b/src/acl/AnnotationData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AnnotationData.h b/src/acl/AnnotationData.h
index 2e8993b316977000ababb7c6dec0bd60c5e4c34b..f1e07b5a915e278602c861a949667ed41eff94c0 100644 (file)
--- a/src/acl/AnnotationData.h
+++ b/src/acl/AnnotationData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AnyOf.cc b/src/acl/AnyOf.cc
index 5a4fc0ad4f0c7c68c09ed4eaee30c906b7a7d7e9..4ac9c8581485d36739cabc641ac2270c72dada08 100644 (file)
--- a/src/acl/AnyOf.cc
+++ b/src/acl/AnyOf.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AnyOf.h b/src/acl/AnyOf.h
index 68f553611fa8ec63b7adc39304bb998cdcccf257..a4d5449561d2db593ea0ba0f06cc1f5fd94ac129 100644 (file)
--- a/src/acl/AnyOf.h
+++ b/src/acl/AnyOf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Arp.cc b/src/acl/Arp.cc
index 3acf92a0c0d10906df43c167c5f2c7f3ae0fc1e5..8e805d7d47e705b8e14ab14f8b92c5eacab38701 100644 (file)
--- a/src/acl/Arp.cc
+++ b/src/acl/Arp.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Arp.h b/src/acl/Arp.h
index 798ee581c76648f1f814b8e7528bc28939a781c3..a41e946d90ae9c491c8cb13d1cb8407580a59789 100644 (file)
--- a/src/acl/Arp.h
+++ b/src/acl/Arp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Asn.cc b/src/acl/Asn.cc
index ceb4191c64b9be5d2251bdbe5b0ae67e3f74cfa1..f0719671c82806e8be42ea09c561532e13f21936 100644 (file)
--- a/src/acl/Asn.cc
+++ b/src/acl/Asn.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Asn.h b/src/acl/Asn.h
index cb3d568f9c79cadb3e8d65430c2acd000cca1c0a..49aefca6a99e293035d1bd93a724cd946556a75b 100644 (file)
--- a/src/acl/Asn.h
+++ b/src/acl/Asn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AtStep.cc b/src/acl/AtStep.cc
index 60b870327fa75373cdde1aa97ed581a945fd5721..c0fbb141c270018ae10701ac3c7471634b8c2660 100644 (file)
--- a/src/acl/AtStep.cc
+++ b/src/acl/AtStep.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AtStep.h b/src/acl/AtStep.h
index 34c103f0c3ce0920027974e280b84466d8ea62d4..ab93fe17914ccb070df39c7800036656dd008a03 100644 (file)
--- a/src/acl/AtStep.h
+++ b/src/acl/AtStep.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AtStepData.cc b/src/acl/AtStepData.cc
index 7fd62bca32072110382ad70812812be5351c90a4..61d839331d667579cf1bc434d1a5a809adf88628 100644 (file)
--- a/src/acl/AtStepData.cc
+++ b/src/acl/AtStepData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/AtStepData.h b/src/acl/AtStepData.h
index 5e85d69b99123ff42db103c3b3e9828b508ba5f9..d0a96e6a9fe3f21c255ec20df2910997e5531b1e 100644 (file)
--- a/src/acl/AtStepData.h
+++ b/src/acl/AtStepData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/BoolOps.cc b/src/acl/BoolOps.cc
index b155434994a99acb4aac5cb2edda7cf33c22cb49..48eab6113b0894105f9c8156fbe1aa989a919726 100644 (file)
--- a/src/acl/BoolOps.cc
+++ b/src/acl/BoolOps.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/BoolOps.h b/src/acl/BoolOps.h
index a307023107f5e301ab70b48baed5689573e46e2f..adf1bd793d16d308480b0eb36bc9d698da9c6362 100644 (file)
--- a/src/acl/BoolOps.h
+++ b/src/acl/BoolOps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Certificate.cc b/src/acl/Certificate.cc
index dc8fb6bcbc0e4e7bd34e072587483f287b44f09e..479d556982004a57f328fcef13a1572460f7ca56 100644 (file)
--- a/src/acl/Certificate.cc
+++ b/src/acl/Certificate.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Certificate.h b/src/acl/Certificate.h
index ecc948bbc2839c7f4103d2cb1ddda5d60511e5e9..1949f3ebe9531287d3aa30a80e0fd849cc05b69c 100644 (file)
--- a/src/acl/Certificate.h
+++ b/src/acl/Certificate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/CertificateData.cc b/src/acl/CertificateData.cc
index 902df23635d556571d42f96e587babeee7e6d3ee..5f8744520a5b641e9e3bdf35f37000f3c66345ed 100644 (file)
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/CertificateData.h b/src/acl/CertificateData.h
index 02d36196fa48ebf2cd6bb57264b01832f55422a4..6944940755dc595ee24be0e8690b5138b6089e1e 100644 (file)
--- a/src/acl/CertificateData.h
+++ b/src/acl/CertificateData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/CharacterSetOption.h b/src/acl/CharacterSetOption.h
index 600a32f6e96d4903f8d59327dfcd29e5b0b520bb..d3b0b7be3373001ccb2450fb626a46af62f3b081 100644 (file)
--- a/src/acl/CharacterSetOption.h
+++ b/src/acl/CharacterSetOption.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Checklist.cc b/src/acl/Checklist.cc
index 3a3862374de528fa803202d9f60bd437f2dcd992..c4a7fc27477ae5d9d3a72d2cea03492a3835ef38 100644 (file)
--- a/src/acl/Checklist.cc
+++ b/src/acl/Checklist.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (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,14 +59,14 @@ ACLChecklist::markFinished(const Acl::Answer &finalAnswer, const char *reason)
     assert (!finished() && !asyncInProgress());
     finished_ = true;
     answer_ = finalAnswer;
-    debugs(28, 3, HERE << this << " answer " << answer_ << " for " << reason);
+    debugs(28, 3, this << " answer " << answer_ << " for " << reason);
 }
 
 /// Called first (and once) by all checks to initialize their state
 void
 ACLChecklist::preCheck(const char *what)
 {
-    debugs(28, 3, HERE << this << " checking " << what);
+    debugs(28, 3, this << " checking " << what);
 
     // concurrent checks using the same Checklist are not supported
     assert(!occupied_);
@@ -372,7 +372,7 @@ ACLChecklist::calcImplicitAnswer()
     // else we saw no rules and will respond with ACCESS_DUNNO
 
     implicitRuleAnswer.implicit = true;
-    debugs(28, 3, HERE << this << " NO match found, last action " <<
+    debugs(28, 3, this << " NO match found, last action " <<
            lastAction << " so returning " << implicitRuleAnswer);
     markFinished(implicitRuleAnswer, "implicit rule won");
 }

diff --git a/src/acl/Checklist.h b/src/acl/Checklist.h
index 676d785b6c164a9ef1283fdf62571c139c657e9b..3f7105c05f675519ae4266af78957f421ec2c89d 100644 (file)
--- a/src/acl/Checklist.h
+++ b/src/acl/Checklist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/ChecklistFiller.h b/src/acl/ChecklistFiller.h
index 7449c9e77aed4a1e3b0152e8148e380f252d1583..34ad0e3654382f251a45b2a455298e1537471b68 100644 (file)
--- a/src/acl/ChecklistFiller.h
+++ b/src/acl/ChecklistFiller.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/ConnMark.cc b/src/acl/ConnMark.cc
index 2160b7605edc914f62c2142a6cf528f94d6fc02b..1478ee7f9c51d81cb900946c18008330604bf914 100644 (file)
--- a/src/acl/ConnMark.cc
+++ b/src/acl/ConnMark.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/ConnMark.h b/src/acl/ConnMark.h
index 1b5d0661037cf3f271dd7ed54380fd50cc623a43..4a1affd4f7771f186ef83ae8844f0d96cc330188 100644 (file)
--- a/src/acl/ConnMark.h
+++ b/src/acl/ConnMark.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/ConnectionsEncrypted.cc b/src/acl/ConnectionsEncrypted.cc
index 9b1b533ac56696dac58d2f059c8f12c930854e2e..a1b3ca746562c407466e4be57bb7f4b00afeb3c4 100644 (file)
--- a/src/acl/ConnectionsEncrypted.cc
+++ b/src/acl/ConnectionsEncrypted.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/ConnectionsEncrypted.h b/src/acl/ConnectionsEncrypted.h
index 9f3f9505d17d2f9df56f7fe1252997b560030599..91f8148ea292c3a01b0a1762b8b2840bf7a0b3c5 100644 (file)
--- a/src/acl/ConnectionsEncrypted.h
+++ b/src/acl/ConnectionsEncrypted.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Data.h b/src/acl/Data.h
index 4a3d5fac173849cc173197b9dbabd935a4a7de04..82b708183eb4d26117c22ff2698bef7fa588ff8b 100644 (file)
--- a/src/acl/Data.h
+++ b/src/acl/Data.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/DestinationAsn.h b/src/acl/DestinationAsn.h
index b026ec7f8393de12989df21d62fb774e7c4a9438..5917f7d59b72767939735fc044a47173bf66305e 100644 (file)
--- a/src/acl/DestinationAsn.h
+++ b/src/acl/DestinationAsn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/DestinationDomain.cc b/src/acl/DestinationDomain.cc
index 60e6d68dbe19177a4eb1d0c0ed3f36bbfdb222a2..a3f3fffdcdd116e4d295446da14268db9be71555 100644 (file)
--- a/src/acl/DestinationDomain.cc
+++ b/src/acl/DestinationDomain.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/DestinationDomain.h b/src/acl/DestinationDomain.h
index 198f7f9e75282cc404d1cf70e5f0683a79ca969d..bbabcbdf249c6b8eba095735ffa45cb176cf47fe 100644 (file)
--- a/src/acl/DestinationDomain.h
+++ b/src/acl/DestinationDomain.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/DestinationIp.cc b/src/acl/DestinationIp.cc
index a7fed9d9c44ea6a3c3f434ca2eaa2c094de42496..ea673723600118ffa762209649d14f3511887647 100644 (file)
--- a/src/acl/DestinationIp.cc
+++ b/src/acl/DestinationIp.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/DestinationIp.h b/src/acl/DestinationIp.h
index fe7ea71bb00a1f4ac3f9f3cb9a149d9497fe2c02..2658c9ea272f355861a67097cb19a62a4c6fc141 100644 (file)
--- a/src/acl/DestinationIp.h
+++ b/src/acl/DestinationIp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/DomainData.cc b/src/acl/DomainData.cc
index abf8c15aa52010e1dd68e60dbf3c25106da5b58f..d4b25130f08aaa8f73ee11678298c4cd60158d4b 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (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 @@ aclDomainCompare(T const &a, T const &b)
             bool d3big = (strlen(d3) > strlen(d4)); // Always suggest removing the longer one.
             debugs(28, DBG_IMPORTANT, "WARNING: '" << (d3big?d3:d4) << "' is a subdomain of '" << (d3big?d4:d3) << "'");
             debugs(28, DBG_IMPORTANT, "WARNING: You should remove '" << (d3big?d3:d4) << "' from the ACL named '" << AclMatchedName << "'");
-            debugs(28, 2, HERE << "Ignore '" << d3 << "' to keep splay tree searching predictable");
+            debugs(28, 2, "Ignore '" << d3 << "' to keep splay tree searching predictable");
         }
     } else if (ret == 0) {
         // It may be an exact duplicate. No problem. Just drop.

diff --git a/src/acl/DomainData.h b/src/acl/DomainData.h
index 0f9091c9be16ca03cb2694e5e451f4a497fb1ecd..cd1b3a5c21b785e93dee93985a35932fcdc9ceb1 100644 (file)
--- a/src/acl/DomainData.h
+++ b/src/acl/DomainData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Eui64.cc b/src/acl/Eui64.cc
index b601d709c608b333ce59d275bc879209aea01411..d2d3d3d0ec8c615e750fead324bd3dbae42ee354 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/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/acl/Eui64.h b/src/acl/Eui64.h
index 42152e61666d564c6ca6f92070cb335dd59690d1..cc8e24d4e3fdcbabbc7ba59f5a5c8376891a94a8 100644 (file)
--- a/src/acl/Eui64.h
+++ b/src/acl/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/acl/ExtUser.cc b/src/acl/ExtUser.cc
index f7abacd17a8f9ae45e31e4e20f0660dc2a3a0898..d720c7e3ac65b74618d0a8a34caf2dac84551002 100644 (file)
--- a/src/acl/ExtUser.cc
+++ b/src/acl/ExtUser.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/ExtUser.h b/src/acl/ExtUser.h
index aec080e5228418e8997c213590d18160f65578df..885f92e4e22ac886d6c9b5c900ce5886f0e1513a 100644 (file)
--- a/src/acl/ExtUser.h
+++ b/src/acl/ExtUser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/FilledChecklist.cc b/src/acl/FilledChecklist.cc
index f2b0cbf9e1e60d059c9ec4374814c4f799b278de..0df725eaf36bcf0d1be60fbd6d7c3fecf6743d18 100644 (file)
--- a/src/acl/FilledChecklist.cc
+++ b/src/acl/FilledChecklist.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (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,7 +65,7 @@ ACLFilledChecklist::~ACLFilledChecklist()
     cbdataReferenceDone(sslErrors);
 #endif
 
-    debugs(28, 4, HERE << "ACLFilledChecklist destroyed " << this);
+    debugs(28, 4, "ACLFilledChecklist destroyed " << this);
 }
 
 static void

diff --git a/src/acl/FilledChecklist.h b/src/acl/FilledChecklist.h
index dd06015fc7bac34849828374c9f5c3b7b972bdf6..15bb05dc044176c3bf4d8bcbc2d82cdef69dc0e2 100644 (file)
--- a/src/acl/FilledChecklist.h
+++ b/src/acl/FilledChecklist.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Gadgets.cc b/src/acl/Gadgets.cc
index 62d5f0974069851d1d206702e2d4ce24ec1c1b61..fb932716ce81be944f6f2a0c977cd4b3809a145d 100644 (file)
--- a/src/acl/Gadgets.cc
+++ b/src/acl/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.
@@ -48,11 +48,11 @@ aclGetDenyInfoPage(AclDenyInfoList ** head, const char *name, int redirect_allow
 
     AclDenyInfoList *A = NULL;
 
-    debugs(28, 8, HERE << "got called for " << name);
+    debugs(28, 8, "got called for " << name);
 
     for (A = *head; A; A = A->next) {
         if (!redirect_allowed && strchr(A->err_page_name, ':') ) {
-            debugs(28, 8, HERE << "Skip '" << A->err_page_name << "' 30x redirects not allowed as response here.");
+            debugs(28, 8, "Skip '" << A->err_page_name << "' 30x redirects not allowed as response here.");
             continue;
         }
 

diff --git a/src/acl/Gadgets.h b/src/acl/Gadgets.h
index a9bac46fed1104d3fff3a2b025718d5fd24dbb07..abd4722b6fac4a91f40843cfcc9187726fb52dca 100644 (file)
--- a/src/acl/Gadgets.h
+++ b/src/acl/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/acl/HasComponent.cc b/src/acl/HasComponent.cc
index f7a82ddcaf0948413c03d39a5c16749e363659b1..fba775ad28ab89ce104d88ddaaeef8b93821c9b4 100644 (file)
--- a/src/acl/HasComponent.cc
+++ b/src/acl/HasComponent.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HasComponent.h b/src/acl/HasComponent.h
index 301d9229c8561e512f9288f419f8167c961b78c8..81f44257e44e7b5643be7f66c2eebbef95274708 100644 (file)
--- a/src/acl/HasComponent.h
+++ b/src/acl/HasComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HasComponentData.cc b/src/acl/HasComponentData.cc
index 81d0c2c46ec54a336a3b44a69eeac47a65728c10..df7256c77d284ca45ab40226149064ac7255499b 100644 (file)
--- a/src/acl/HasComponentData.cc
+++ b/src/acl/HasComponentData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HasComponentData.h b/src/acl/HasComponentData.h
index 0e5ff752ae95c90f4505b2889530cf017bdb40ac..7ac7b4d84823b07f7c47d33871b28c8192884fd2 100644 (file)
--- a/src/acl/HasComponentData.h
+++ b/src/acl/HasComponentData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HierCode.cc b/src/acl/HierCode.cc
index edd7945fbc7f4c9937286088ac46c75a2d29fa04..001b654d5dd860090bfd80b674af5c887b1fd84b 100644 (file)
--- a/src/acl/HierCode.cc
+++ b/src/acl/HierCode.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HierCode.h b/src/acl/HierCode.h
index a3b68477e5572cbb99b935ddb0a1bcdd4003109d..78b7a1595b7d132e6df936f47664fd924cbce94c 100644 (file)
--- a/src/acl/HierCode.h
+++ b/src/acl/HierCode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HierCodeData.cc b/src/acl/HierCodeData.cc
index de800ea07bee13ca5d1363f0ca24d294b2dfa6df..80ab1c02a9ecca05e15a10db149e20c5af28a735 100644 (file)
--- a/src/acl/HierCodeData.cc
+++ b/src/acl/HierCodeData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HierCodeData.h b/src/acl/HierCodeData.h
index f20259572c6ee24bb569cdce11ce724f003664e6..fcf2d43371ed4aab23f9a1ffc0d6773a2757ad77 100644 (file)
--- a/src/acl/HierCodeData.h
+++ b/src/acl/HierCodeData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index a2736d4bcb0bed22117483317720d4b988248715..891173e893800fceca6823c4b2847bc873a3bb75 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HttpHeaderData.h b/src/acl/HttpHeaderData.h
index 2599eb7ac5ff84d6bb7a97af5d5006ae9d092b5a..77476d5c1217da0cf4a753af03bf488c76c20878 100644 (file)
--- a/src/acl/HttpHeaderData.h
+++ b/src/acl/HttpHeaderData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HttpRepHeader.cc b/src/acl/HttpRepHeader.cc
index 8ee5b01cd65c383d8520987c3ab44291bcce4c6a..f82f8931e04f91122a93917c31d80cdc188144a5 100644 (file)
--- a/src/acl/HttpRepHeader.cc
+++ b/src/acl/HttpRepHeader.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HttpRepHeader.h b/src/acl/HttpRepHeader.h
index b6d47959d1496906afaf8bec21e707ebcfb66fe0..639c30dca6f82c32609980ed6f2186ff311b44fb 100644 (file)
--- a/src/acl/HttpRepHeader.h
+++ b/src/acl/HttpRepHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HttpReqHeader.cc b/src/acl/HttpReqHeader.cc
index 26e17daa789bf88eec0a40ce49095a68cc00dd54..746df7b7793a18cad93b28d1f7903fa4c7520709 100644 (file)
--- a/src/acl/HttpReqHeader.cc
+++ b/src/acl/HttpReqHeader.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HttpReqHeader.h b/src/acl/HttpReqHeader.h
index 89d010c5f5285d88b7f28fe6e9507d51b1b3efe1..c57b76f3e7576e9a2285b0e8b4be44a9c1bd6d98 100644 (file)
--- a/src/acl/HttpReqHeader.h
+++ b/src/acl/HttpReqHeader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HttpStatus.cc b/src/acl/HttpStatus.cc
index e3563d46800c962912387b7907a3a41c1b778f93..452fd9d3d3359a9f4b7e6c2d61e7cb8a86ff08e8 100644 (file)
--- a/src/acl/HttpStatus.cc
+++ b/src/acl/HttpStatus.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/HttpStatus.h b/src/acl/HttpStatus.h
index 23f915ec4b11920a92192d3311ed59aa462eac86..ad72b19098c6d9eec05e7045941341288a2073db 100644 (file)
--- a/src/acl/HttpStatus.h
+++ b/src/acl/HttpStatus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/InnerNode.cc b/src/acl/InnerNode.cc
index c771688e295597c578107dbc9dc62cc65b3ccd16..9924db74b7b0d7c0753ab0aed5713690ffbdc69b 100644 (file)
--- a/src/acl/InnerNode.cc
+++ b/src/acl/InnerNode.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/InnerNode.h b/src/acl/InnerNode.h
index 4ba5dfbb338cfc3a26a778ee9f8782ddc88f4cab..3ad2eca22edcc1d344e63f909dc6ea98ff4dd654 100644 (file)
--- a/src/acl/InnerNode.h
+++ b/src/acl/InnerNode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/IntRange.cc b/src/acl/IntRange.cc
index c3540a74afee3b96c92499313b2f23c0c858e7e8..ad0849e2a4c17cae610e3ca918200db4f7a48ebe 100644 (file)
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/IntRange.h b/src/acl/IntRange.h
index 498fca40acbb737e510ab63200724abefb1e3571..fe372422233e1843d77b3d9c11f3176345a0a3b8 100644 (file)
--- a/src/acl/IntRange.h
+++ b/src/acl/IntRange.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Ip.cc b/src/acl/Ip.cc
index 759b9a3fd8596101c58a77d5379aa87a260fe068..a1193140e2248c5b8e7af05d1cd15c33b557f0c8 100644 (file)
--- a/src/acl/Ip.cc
+++ b/src/acl/Ip.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -464,7 +464,7 @@ acl_ip_data::FactoryParse(const char *t)
     if (changed)
         debugs(28, DBG_CRITICAL, "WARNING: aclIpParseIpData: Netmask masks away part of the specified IP in '" << t << "'");
 
-    debugs(28,9, HERE << "Parsed: " << q->addr1 << "-" << q->addr2 << "/" << q->mask << "(/" << q->mask.cidr() <<")");
+    debugs(28,9, "Parsed: " << q->addr1 << "-" << q->addr2 << "/" << q->mask << "(/" << q->mask.cidr() <<")");
 
     /* 1.2.3.4/255.255.255.0  --> 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 f07b3bb865f7ee0ad53fd7acab7a102bcf126877..cd346d90333a735765715f735dd40211b5472f57 100644 (file)
--- 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 79c41b0c1f929dcb4a121c5ef10c37b1fe1785cb..54b6ee17e8bf3aa20542859a577f7054d9bcea6c 100644 (file)
--- 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 57188fd13900955fbe029079554c5e8925876e56..f445524fb8eb70798b6bd5b966e97ca4e9975bde 100644 (file)
--- 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 ca4e81392598ba791b283977d63d97eaf4132a4a..41c7dfb5c221236427a53561810132f90c6866ea 100644 (file)
--- 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 54500d77883e02f3d4c82367256dc3fccf32de04..5f64278e7f4ea058c9d6470837e8fb0844940458 100644 (file)
--- 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 eb35c048afc52357d6d3768284718df446a1913b..d585aba960d1b44debefb3d4229036949a200b0a 100644 (file)
--- 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 2e0f47a5bc4d8a0a7db58e54ea53376ef974c42b..f57e4eb5a10b9c9d91cd5e43046d7b4186d552f4 100644 (file)
--- 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 14ce5089f6cf6d4f52cdeb0b90202161d6f0d84b..d6441f7da4dd3c2bec4a4010682b0ad815cd1a32 100644 (file)
--- 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 f4021b81b8f266955f714487e06c000802286799..37b12867324c01d792b2b21041d6b19e1653faed 100644 (file)
--- 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 fe04ee38fec18f7fa6f30695771069dc7452be37..42c0b138f3dce8a0ad85b7addfd414df7dbf707d 100644 (file)
--- 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 69154e3f8d3c8ed1100bc20c9b5a2366ab26b9b6..e60fc3076d0229517588f90329619ca8009fb16d 100644 (file)
--- 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 b6ea55d6e477214444c8c57a24909ea97131c785..eea68d9c821775721bab84ce164e54acd485228d 100644 (file)
--- 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 2fdfe31f876ed1043d28ad3e9ad20b6d306ac5e1..a2ab2af63a21fdb793e5d824d896af502c1dec04 100644 (file)
--- 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 da0d9ed72f48d7a17b904c732d51aa6537cc8b04..dd40e5fc6414f786b1a5a8e9a903a022acaacc5d 100644 (file)
--- 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 c0e210d5d5e42149f027a63f6a9038b8b81da257..3cedfbf5bae727dc75601fb0e10e0d0a37cf9f99 100644 (file)
--- 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 6177e26f54a07c87389f88e05e86799f8f3f9147..7aea5e00d4f0881f208c8f624add6a154c0e1f79 100644 (file)
--- 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 a8417a1288c1e886c8177868e7178e06c32b57d4..df8dfc0819c3e69a72fbed96bf8e4e5721212a1a 100644 (file)
--- 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 ceb87dd5c2cf566a45fb6718ecf44d45ac530917..51cc9732c4d7c67e3b989667aa2c710bd128a0a0 100644 (file)
--- 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 4a7667d5fcbcacfe4a9473e5038ebf653a06b661..b06157162631d14d71ff8599e9fa5deb4439acbb 100644 (file)
--- 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 e45e0af471d19bcd72378262b8bf53e711099329..5b2199cb02481c6c6d835e7d27b09d2c38afd7b0 100644 (file)
--- 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 2a651137e46854de41d757da666fa91cb3ca98b8..d1ec1af2e7eadba9005918b4d40222ce418e7cd4 100644 (file)
--- 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 77ec5298af45fb13b910b0376a6a2fa0a1dc618a..3cb3a1ab02190da2b6ab1d7df80dc2097bcd8dc9 100644 (file)
--- 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 c6cd757ae2145b4cd59e73a3c94115c2d04b1ee6..b20809edda8a6d3921f44e7a38f4b74194ec7762 100644 (file)
--- 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 24adc57944ebd47aea9c414e57bc6fbbb81d9f4c..13e41ed0178e48a0cdd207f99ec0c8641bb562bd 100644 (file)
--- 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 d69ecd2c163083260d905162df2d113d62b21a2e..c1b8fec64c10b633276fa32bf468ce765f55045c 100644 (file)
--- 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 6fbe09e9f96182c02ff66a5fa4de0760bf74ac5e..a1c01b93bee3de42ca2b256f91b96876f8e9be4d 100644 (file)
--- 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 f3813df2385e0941db51f089af8f5f02e16105c9..5a406e42efbaaeb400e59b2f363d919bf07bc060 100644 (file)
--- 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 1573f8192cb0c20af352d26fc33c1362eda994e9..d1e12f205e49a3b52dbfc717fde292cfd4032e7d 100644 (file)
--- 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 ecd9c33ecd749dd988871bb73bf117b302c07b03..c70564682bdf40a797a0adf94f2f17e136999be1 100644 (file)
--- 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 0512c0ed496d88c27e026ffa8e8ce13ce953813c..66b05eecd05720c1ad1c68bafa78efcb7910cc0b 100644 (file)
--- 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 a4303352015e4985c4f3e893dca81072c9dab098..eac80467731335911bf90c18d7a9b806d5924cf5 100644 (file)
--- 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 cc4b7bbef2571a40a7b053aa1e95800cbdb7eeb2..0ee9fc36f9a76be5ec43920187bff0e4a51a6e2d 100644 (file)
--- 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 2bf7efc145f76e81bc331d4f79e1553f4957e2a9..18bb421796920cd71153e132556a3af096eb9271 100644 (file)
--- 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 fd8c9f45649d2908d68707b7b6740c73a2dcc7e5..682cb7eb15bbbc1595b4f2d73f62b0016979134f 100644 (file)
--- 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 21c8591b7b468b99d7ee60feebb975b7a03d0358..6db2105a8d7aa3240d001b398d7c85f4d24ac30a 100644 (file)
--- 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 3ac35e7f0132fd2f52e0f684ffbf8e780df406f8..ba300cc17eb9480e49a8fac4e6f5ba6da9e14c28 100644 (file)
--- 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 ad43affca0df918bf1c6d5d133b912bc82d59003..2aa627320d64132432a2f26a7ea6fb353ce485f5 100644 (file)
--- 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 0bb4be7a68d9605b4636c57c2dcd90ed0e0e9316..e3f54cd6c18d29d5d35f08fc70fc074c684156ea 100644 (file)
--- 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 90cbfec039bdcb2218dbdd6a0db4caad0fce5416..38be7e1ce4005d5d13669bd405c7f065c47d5eed 100644 (file)
--- 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 91b03d271e9e3014448d9006908326d37c6dd3e3..af9b1bdd58072e1e59a42e43b0f4049f257029ce 100644 (file)
--- 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 8e7b9c8d2ad4b259a9f190c754c9b5dddae00c9d..d93aefa9e8e9c9c91a44e0e06e40d4a75db51905 100644 (file)
--- 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 10bb95300d06dcf9e03da42c3b48aa43233e9747..16ccb905004bb8ed5fc430a8e13f73d2cc4d43df 100644 (file)
--- 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 daf3a3e92b285e6413caca3ff65e5e4a60292b5f..d37b39763fbbb65c9709992f7cddac1508347015 100644 (file)
--- 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 6e3e8c2babdd92474fcbc681104651ba0d393c9f..6547623efff353b6dd2f7bb7a7db997b9bb49d71 100644 (file)
--- 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 402be8823a3b6e35459f9696dd918fda565b5e1a..47bce6395fc3e1135fcbb1bd1058748852edd5e5 100644 (file)
--- 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 5c7148c02ad2525017e4a956de884bcd33f9ae8b..f74bdf6bb6d96e568d5d889c9f74c0b026147e6c 100644 (file)
--- 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 3a7787f0ac732a0be5513ab34f3275e60c1501a7..13acad7b614fb1a57903c2f91d4e7972fee2cefb 100644 (file)
--- 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 c107d735f781f6a516d337291a8ca431f208075b..482a63fa9da2d4e87b6e8bc6903815c2c63a2fd6 100644 (file)
--- 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 dc1687c61b14d952652defd2bc4485c54ca42f1c..6ca38ef79fb5ba974d1fa838fb6af3f714b4ea06 100644 (file)
--- 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 004415e9f177ad10982f519a224315e05aeca683..e1e1375ed1cc77bf901d95ccc6fc3c11f8c34a9a 100644 (file)
--- 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 f4fd6a203247258adddca3c6ed91f7fa8acc742c..75c9981d22f9c206015260875b71595a98e2144e 100644 (file)
--- 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 8fdb490dba06cf86c4086af0e2c9822f45c88e3a..303beccc9c670772557a12f9df01844abf829f09 100644 (file)
--- 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 f3814667bb58af2b9db25e71dd362ca6f1d33ed0..1c745d2b1f906be7577f4ddb7face6a235071a6a 100644 (file)
--- 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 1a8aef989ffbdb73ee6a789cfa6113809fb93440..27b2a6695f8e31642a5cf573a6dc7a7f37d52235 100644 (file)
--- 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 e1fcfe7c2ec8d982d2efb216bf64e0376bc7a78e..ae50a8aec3ca0d382aa86407037163bec69a5910 100644 (file)
--- 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 96affd403357369e1ba0e3a662f83332fed2a1d6..c0e4be364fa0cb9432cb4d1906b6fe98018d3595 100644 (file)
--- 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 7e94c8bc76a8357c5d384687b8fbc7f519bcbea7..a2a22418860fc6c3547a89c7fdfb7a3141e612b3 100644 (file)
--- 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 4f07b9a760b77de56ae241542b1f773d44bd19ef..d6f0624109a5d3237186039990d034d77d5077f6 100644 (file)
--- 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 f2a512e9f2b4e9d583cd7bcd13c072e9fe2ffdc1..828aeb76a47236130f6c202b39cbf490f0aae9f8 100644 (file)
--- 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 13426f4caef4c0c8eb7b104e0cf73b4a47303302..cf18050bbc4400de58509409a09934d2afd2c87e 100644 (file)
--- 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 13d9079f4e75881b4ff8fc128bf92aa8d582e7a7..a1637c7d44c5e73d50e04bf804d59b1df7b56da4 100644 (file)
--- 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 15c755c943f61595d35882d00ac34d099e6efa29..260850958cbfba08c63e16b884f0ec50e62ae3f7 100644 (file)
--- 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 b4e8ae991cb4e503668d2e729e33a816f788ddce..f6cf160315feb93f6e2e1931f230ca333a40d17d 100644 (file)
--- 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 c7897b73307f7d04ff569cbefcc53d802aae011d..c87feb3c8f8220ef860808800c05ca1ec29f8b22 100644 (file)
--- 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 de786f3c2409bcb8909420bd2d7b8a74a4bb31a4..aada3f932f2ebf7786e45a5480900115a1575619 100644 (file)
--- 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 394ca8cf19e4817fabc1c89bd0e09d1586a3b7dd..8051080f9079ef57e4a5d30511981713d0251c9f 100644 (file)
--- 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 f6cbb798e1287f7fd8d27816eaffb700bebf7232..f897a59bb6616dd4717d6557acde51966aaff87b 100644 (file)
--- 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 eafdea65297cc24caa57e69fe5a0e2619432d7ab..8cd63fd2e97aa0d5b2581aa0420fb1d4a144e7ea 100644 (file)
--- 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 057f3a8c55f1da3595a23bd899bfb4baeef78bce..66745ccfa27debf0607cf8e168bcf24198b157c9 100644 (file)
--- 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 620d771e823e02574259574374192ec74fe62ae6..10538f70b969cbf0eb74b229b574429391a87737 100644 (file)
--- 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 602dbc361c8f1ff3c1cbda34ca20af7bb17d103c..ff3e6db90df550b031da0d043c0248c79b318af2 100644 (file)
--- 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 993ac630587dfef425f7854bd36680d09e8db99b..419d44fc1754e197ff25b8d1d31f7e38d5f75987 100644 (file)
--- 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 690297995734359fbe3c360a01dbc917c620d590..6214694bc1a3d1a154f99f07fad75b9cee53aaa8 100644 (file)
--- 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 3b989d0ac7493f1d4eced7345ad0581012be3c6d..e14b9320b179d18ba468b5c6ba2843fa39d590e1 100644 (file)
--- 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 d96d312121e8fd75b1f84b4e5079d09c49217721..c81474dda6dd7c3cbb52de485676b7abab51c0b0 100644 (file)
--- 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 0a8f4862c55a48bfdce4164e0bec862d0082492c..939699fc901b710d116bc2a0686dc9761878fa70 100644 (file)
--- 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 31d205f3c1b34d33b8086d41b788cb983dbef169..c07c33241512fb4b1abfe17d40898ab04834cea4 100644 (file)
--- 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 f83c6125c7b7239976f69aa3e0610d1982272be9..e52ccafa98a14ff8966dc82a0559b153215b1343 100644 (file)
--- 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 4a60817cc6ff1b709f049ff4fc9f374db00a6239..534d6292bec75e1d3f4adeee59e43319bbe1a23b 100644 (file)
--- 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 a749436edc0ed1b36d7871956984a64924be87e2..ae07e21a28fc4bc389690819ef2ffeb5609c3bfe 100755 (executable)
--- 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 fd498895d9fb3b7101b7bd7053314ad5485ebdfd..9c9667fb65f7136c88ac645b032abaf015d17010 100644 (file)
--- 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 ec2890a2df9ee56aa4179a119a3f8c0f3dc3e4e2..9d482f855cbecce7dc91ae992106ed1c512d71ee 100644 (file)
--- 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 08127e3a8760068cccbfba985d218616b8830803..6bbcbada907218996179025c727014c4b907c33f 100644 (file)
--- 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 857cb471f07d980d2618e48ad73c20b7c494057f..e471eda3f6e9c0688848391c7acc954a4ebdedb1 100644 (file)
--- 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 2f4b673649d97fac19e65b9b1cd6fd3862445adb..b575b60698e6f39929ae6e3aea3f893731c0a428 100755 (executable)
--- 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 d4b0e490fc8a8316483dba3faaba7db071994958..8b99773d057e4c184217e8b09280799736fa5169 100644 (file)
--- 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 93801ebde2011ef0611eb01ba9c2b1a458f85a40..50c7299207653bc14705516cb7aed13fa427376a 100644 (file)
--- 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 c6ca3fcaeea8ca0b0ab0d8d1f2a6dca5e56488da..50ef7aeb2cece0bebf3f9241834c78c33ed5fd2e 100644 (file)
--- 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 5fe8a2cfb11e0ebeeb7a7bd049478d36666b04d2..570862837581b2b0878451a53472b023b0a8807a 100755 (executable)
--- 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 6528c9779cf7502b87ed7fade463eeaed9c5b5c5..c54ebdc9e79250dbe3b7083d5d203f18b78a9ae8 100644 (file)
--- 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 28fb0431c4003e9795f341910ef53d939365c0de..f8560e71722585bdbd740cb01cbb65db07962a2e 100644 (file)
--- 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 9fcdba40d78c6907b86dbe6f0265fa8c1e505935..69af7a72aafe0f35c23d40ef3319ea452026fe22 100755 (executable)
--- 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 <codemarauder@gmail.com>
 
 =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 729c1bbec60252a91fa2abe5602f699b0ec6dadf..eb815ae17dfad8fecd4374d29af100619f86a07d 100755 (executable)
--- 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 85c9fbb2345290fb6698b6eec418a6d80c8acc4c..d6dc640edb182f6f2099dc606fe6c8915c39e064 100644 (file)
--- 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 a98c713d80b06dc97d4705f2d5a8fc5b34331e23..44fbf9f9699132672026e3ea7d9e5985b0b33e7a 100755 (executable)
--- 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 <kinkie@squid-cache.org>
 
 =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 b1da53da41df4fa6ddf45a9d722fc4e9be45da4d..01c9ed7a866c07b88ffc59bbca8be2d3147c91cd 100755 (executable)
--- 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 282e2575b2130d9146d9f550215fe9d64c81b58b..5f7077e9489b9bc9bf02623646f21dbc5d12fb92 100644 (file)
--- 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 0733dc598d4c3a512feab53b87ffece6cae485f2..082f6d39c08a357952471f8151dd68e0a6f969a1 100644 (file)
--- 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 c9eacb81fc5b4e31b473a4adb94079ac61526be1..300ecb18e4e98b34a1789424d7c839880c3e3955 100644 (file)
--- 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 0128fbdade7b9bcada36d6941e092f8db7ce63ee..3d78cabdfe1fa342a3ebf1932b6212ba220a36d5 100644 (file)
--- 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 e6afd86b1762e46d0fa972a22f788769f51fbda3..fd74f3d5d92585072feda1b68fc4dc3c31217c2a 100644 (file)
--- 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 fc2245fce45c256619f7522708d8470c9df8a87a..e0f8cc9ac8a5dd63516392ff0e7723d859aa37fa 100644 (file)
--- 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 6acaabf8ffc5f0298377d94796974ca6f759fe64..61da06a46fe05f5ebb73fbf189f3eeb76a35189e 100644 (file)
--- 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 36c8c87fd8d6c18e307326d382a14cd24fb6a23d..66d98179fbb0a3e3bd271446e2a1eb683f9453d2 100644 (file)
--- 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 ef001da77db44e531ee4ca432ae40ed4d7e45337..163b5b85ac84b3df734a3fed7b3b5d63a71f94b2 100755 (executable)
--- 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 fb8ee236f8ba7200a1e709bbffdbac0888ac6b20..7244b710c2eea64d796071906abbad0fe8e9cd59 100644 (file)
--- 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 0581d2ec29303a41abf8903907d3f49fec68688f..44df7e365bab9322e3df2d6aa46bd00640e992de 100644 (file)
--- 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 51cc0375a60ac8c33a7f3fe6f7e3a91cbfa8f47a..1f933741f36384ff47cfc978aecf1edf1db24ee6 100644 (file)
--- 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 eb86d550f2e3163128d52ca3b71ca106dae3c283..8df3e2693aa1a332193a4abd15a432d7ec6f8c2c 100644 (file)
--- 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 aca58154cd6f6be38535b02326ec4051c169afee..4a8a17614f672d2e46fc67adf4e5445ed865e4bd 100644 (file)
--- 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 2d9803f2d58be22474d069ee3998393b28323bd7..846bd84da0e39ebc63948213fee53e2af1447677 100644 (file)
--- 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 345b73edac442b7638847b0d33fac91afaaa288b..711b1d6066127152752a62161aa53c431a114fa6 100644 (file)
--- 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 abcd18bc2c955c543825637382f01e8f143a823f..a0e76cc0c1ed2a47d2228ca214fb849654404ac9 100644 (file)
--- 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 0a005204722bb7b206e72d53fac4a92b334446d7..abf42fa9c526fc3e15c9377367c38e1fc6848a50 100644 (file)
--- 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 b98a456790155f1fec66ca5bfef941697c61e5e8..08ff075498875ba282ee3e3c36231949df28ba98 100644 (file)
--- 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 0d88f75c4ff021ab6cbb5ee4f40eecd72a4eb127..c0af31eada30c08df0a3be20e8ac6952ec733ad1 100644 (file)
--- 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 224a1f3b3793517eeb68cd6694c33a28e3d2d693..221c99145468e9abda7fe17b302b280cf0895634 100644 (file)
--- 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 3ecdee253ff9366da9d911f03769b0ac5106141a..4edfef50d94bb1eb3b523bf23e23c853ee90cca7 100644 (file)
--- 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 07f2904f2bce54eb7d433c8d88c945af21c60ed0..ee7ca3de7fd723ff1bd4cf88045f627003b43e2f 100644 (file)
--- 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 831449920b8da27adb314ac4d2a42575e2b33726..61d531f7ea1230646f44ca6d769b9f29ba8d13ab 100644 (file)
--- 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 7eed9559a173cff93ef7d61af66b25a09149c54d..ded831ae869b27b14009aff07a31f4312c765902 100644 (file)
--- 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 925c585e477005a25e3295f0c3c9f24871f757f2..257ba6d167452aa8e4b4639b02aa78d2156dd3d6 100755 (executable)
--- 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 <markus_moeller@compuserve.com>
 
 =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 c8e89eb99028eb8b4348224dfe5813790e9b58fe..f7965dbe0dc68f3dd2c578fa73ad934c69b8a846 100755 (executable)
--- 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 b64095fa671887d32b4eb107fe70a2599ff25f27..ed452042eac046e8de84def89c59b4c532f9e221 100644 (file)
--- 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 89785ac4535ee043409b3fd5085ae2379af4144c..1f65b59e77f851b148c9b8227014532dce75753f 100644 (file)
--- 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 5c7530daf82e4a670ef4666d594b2ab855266ca3..f25277f1054db74129852f6591efdbd91befc662 100644 (file)
--- 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 fef0dcda6752f84c08eb8a1915fe14c5c58e3e70..23f6512a1339e1041e917086f2ae11ce6d73c5e6 100755 (executable)
--- 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 3d7852b3e88056f238d2ea0f2763950795130574..e0e7a46eb88cabc7b07d7e9ca6295d0b62c2c2ef 100644 (file)
--- 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 88cf313acdb96cf2cf8757d4d4c4027b0b17f754..daf899f583f062c80f8f73c7482304153af5b46b 100644 (file)
--- 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 7b4edb940bcbea89a7c1af9daf9bba2b41d6a32e..8b6e4f3f25908387ed12dd09c1f44639710ee389 100644 (file)
--- 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 70007a87ca0f4b84a38a197b5ae82e65c438c5ff..046707dafcee93ae7df01acd292cb04699385e76 100644 (file)
--- 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 0376a896b77039fdb2060918a03879e9ef3c92ad..224594120cbc287c7b84bbbe2aa48e4cb032d11a 100644 (file)
--- 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 92eceb48f2a4aa8baaafe857cffb5e640d85bab3..39192ccb53a8125861a85255edc3740266d1f26c 100644 (file)
--- 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 8f23443f94674b0b6a33d681f287b35d43887c7e..ed780b8ab630bf08fbf8e04cdba9aea080f3a78b 100644 (file)
--- 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 191942f23ea7f64e4c8241b120b339fc3400b6cb..4ae5a6dea100a9c532bc2ef32a857c63b46edd0f 100755 (executable)
--- 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 04ba28760fa794035ceb100701671c3ff35d883a..a41bfb9461356a6c0be31039ad2412767c97b0d7 100644 (file)
--- 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 95a542facac8a2e0d9e024057019b1beff41c52a..a0126b6071043e12b1294983a7ca6fc9ea46b251 100755 (executable)
--- 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 <amosjeffries@squid-cache.org>
 
 =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 02e9d9165b2230dd5f20a7ba7819cccbb3a8ea9d..b87ee85073a5f00ebe3c85168ecbc1aff995b18f 100755 (executable)
--- 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 6ae09aae3033d781438efc50f82bb1d3fee8b13e..df24e92e81609e8e69259a9f5aa3bb85de0ec3bd 100644 (file)
--- 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 505a24315d8afffc3d26db85690ad8f66e75fff2..e32b507843b89b469999a579b15e181a70371737 100644 (file)
--- 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 aa57ec03d3c74c302cc28c015957414a49c43280..be4f6417c0063d6ebaceeaa7fe86a8bf77a510b1 100644 (file)
--- 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 d5397254345a7c57c4038902b843bbb80eb1ca96..6a8fb8a487f370ce96ee397838c8e099add1d454 100644 (file)
--- 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 7fad34321a320aa02164361e0d20e3ff3b954dd2..b9003b7c1fc277fc68a69c4f7329411d24b3c826 100644 (file)
--- 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 d3258ac7f9f91de702473ca9185b9c00afb2cc8a..6c0816fe3cbbeaba6c1d510cd8a0b52157ba7e76 100644 (file)
--- 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 0d33bfd6b1247a282f2ae943f25ac964d01d24fc..c6c9f08a69521659306c70c7607096f2f695c559 100644 (file)
--- 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 5a5288288f4ccc4e43e85a0929256841c15935a7..114189ec8171dcabe10c4e9c84317b612ce7c36b 100644 (file)
--- 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 103fb2a3938adb942cbd9a0da03efbc48929c7af..28916f4ef08bcdc75e1ad2b070ae96181a4ce3dd 100644 (file)
--- 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 4df512be75515e2cea545338f3b7199e75900544..97ecd1295850d59ddce3fd932a3b0077da497a65 100644 (file)
--- 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 1857b3a57fb47d585960f3425acbd590d675503f..1bb1163698a25d75d4a5d55a16ffec33c011cc7e 100644 (file)
--- 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 85f4563f867d6a83b7c7a1d586dfbb7c39d17b67..20066051932e359248d2930a59e4b802790effec 100644 (file)
--- 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 a555016d786cd7794069559d121c3a8f66e127fa..39aa20fb24f0fe053ea1a4fe49ede9f9770fa3f1 100644 (file)
--- 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 04c5e27a3d74cc897c69a8d60c3abb0ea982f00b..228faddfbe40ae04b69f2383a3794158585b0655 100644 (file)
--- 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 e2a3095e61c01f19f38cff985bba4ff227223eca..045dd01a7e0914d49c9a931025361169d00df547 100644 (file)
--- 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 0187e3d79302a429ba3b77c8fe3d444da68d1a3f..38e1dd1165c60f29d376e01a5a2ecdc53fbb6342 100644 (file)
--- 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<Initiator> &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 5fff7ffb502a5670696bc50ff3b2fad365a28783..0e8b3ac5a0316001a5f1a2aca7a5802e7f630bd6 100644 (file)
--- 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 31e3c9a5ef65048bb653610f705777c6f799e74b..5af7d09b28f1565664aa930bb1a47a63d32fc207 100644 (file)
--- 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 78a1de631a9d0ab74442cb97fe1795a8dac564ce..d1f92f08682d8946f6c63c75335baec55a7e5e0b 100644 (file)
--- 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 b2233636340661e1f98b820e9373861dac3bbd98..7210dafe54c128170c2e83ce4fc2dac9accbc703 100644 (file)
--- 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 2f8f410a0d2edc63cc865a1c9c9bb003e2c2a848..c4ee54be846d1b1847f330fe8d28caa7922e27a7 100644 (file)
--- 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 64a94727fd5fcf0c2ca3411aff4b6254ed1cd6a2..7f9d8dd57197dcfe66d9a6cb23cbf39713dd4476 100644 (file)
--- 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 59aea4a575479a616fd62a2a198df1aec6dd2d69..fae59a836e767b42e779c59df4acee9f9a58ccc0 100644 (file)
--- 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 5c2cbc96015c6ceb5552a8b95886cff067771737..fb5737c3945e1eb21551753cac2887223fbe4294 100644 (file)
--- 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 9a5a85e719b4c9273bbe3dd1f2acdd0067116633..73974d8aea7755a4a2528baa4b93de37f8e94598 100644 (file)
--- 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 0b2ee24b81025d26259c0415a3b3002ad51130cf..10d98b4d638dedc97af6e8e5745b1da57babe887 100644 (file)
--- 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 edbf5c55fc269cd813315a88744fe0c07c5589e6..30e09e24d9d8505d4dc7fc14395c3837811f6f84 100644 (file)
--- 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 00a9b8a9e5d39c51930c2de810b4df93c2fde6aa..c82e1c495c02954b361f365dd722e04577a19a03 100644 (file)
--- 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 28d14ff0faf21e38279901a3c5d63439e599012b..3d24133b074577b2e9cc184d29d6a0264c013b02 100644 (file)
--- 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 54b18f3e12854d5951bb862cd1642610df2d10f0..8af65ed6da1239f6750d5f58e7b407c5a38ac55b 100644 (file)
--- 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 3b6992515843a3f62000e062d411639a33cb0793..42ad096898a4b5f19dbeb8133f6a1c62958d4c59 100644 (file)
--- 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 f8849d6276ed9ca1492e6d3ce317c18704655759..c2d7fb3e09c3f6cd666cb971f1b51271293f1ea5 100644 (file)
--- 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 79a90d242f4dfb2d8e5bb7bdd3af1c91c498b3ac..002b8fc1850ccd21ab7a35d9c9d99dc5e7451a1f 100644 (file)
--- 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 a56fda7a2d5ea391fe78c2258a2046fbead3ba9d..dfaa93527a3d1217cd5adb0120d3d01b745ddf58 100644 (file)
--- 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 33fbb5adbf39f2a9b1949343547f689944a0738d..edb55de0b3a9ea403b00d4a0598e5431ea49fd50 100644 (file)
--- 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 545e029cd8da210d49d7ce5b023b146f344f95e2..82c71e9f1a8d1cbdafe20bcfd6e266b05ba14d60 100644 (file)
--- 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 45f3302691ac7fc0eeaa857b966430983cfa9af7..1575b76b0ec019b5216a4a9992cfbb67d0561689 100644 (file)
--- 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 618dda084050c958f4b743d921dd524ff6631f53..c5ade9ca0cd31facc313b132fbdb2ee6852a75ab 100644 (file)
--- 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 f93b3798fb1a1c25b6af2ca1bf642fffcaec7b94..d91a9dd1a6393094d4fd9eb762542df8523757a5 100644 (file)
--- 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 53caca71b1ffa2b58a7301ec5c345a135ee8bb99..1bdefd75deb32b148c777d2633cd54201636ab03 100644 (file)
--- 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 d5ba384791ad426141f274f6425e82361592bd2c..24e48a82f1195f4ef301383e44c03bb17a6a9aff 100644 (file)
--- 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 4a1611709b3d95565a129a11c26705d933cc04e4..c20ab896fefaf3f0f0479a67971c1c6da722bc55 100644 (file)
--- 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<const ServiceConfig&>(cfg()));
     theService->configure(cfgRep);
 

diff --git a/src/adaptation/ecap/ServiceRep.h b/src/adaptation/ecap/ServiceRep.h
index 5d9f2c41980a37755b166ea332af5a6ce9c065ba..30b0d3c7944685e5ba0160cba24f634536890312 100644 (file)
--- 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 ea0795a7371ec6912acd41e4105aa9ae722bb944..8a5edc89c401a7628e203e1d6463c6139d279747 100644 (file)
--- 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<libecap::Message> &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_ptr<libecap::Mess
         updateHistory(msg);
         sendAnswer(Answer::Forward(msg));
 
-        debugs(93,4, HERE << "adapter will produce body" << status());
+        debugs(93,4, "adapter will produce body" << status());
         theMaster->abMake(); // libecap will produce
     }
 }
@@ -444,7 +444,7 @@ Adaptation::Ecap::XactionRep::useAdapted(const libecap::shared_ptr<libecap::Mess
 void
 Adaptation::Ecap::XactionRep::blockVirgin()
 {
-    debugs(93,3, HERE << status());
+    debugs(93,3, status());
     Must(proxyingAb == opUndecided);
     proxyingAb = opNever;
 
@@ -587,7 +587,7 @@ Adaptation::Ecap::XactionRep::noteAbContentDone(bool atEnd)
     Must(proxyingAb == opOn && !abProductionFinished);
     abProductionFinished = true;
     abProductionAtEnd = atEnd; // store until ready to stop producing ourselves
-    debugs(93,5, HERE << "adapted body production ended");
+    debugs(93,5, "adapted body production ended");
     moveAbContent();
 }
 
@@ -612,7 +612,7 @@ Adaptation::Ecap::XactionRep::setAdaptedBodySize(const libecap::BodySize &size)
 void
 Adaptation::Ecap::XactionRep::adaptationDelayed(const libecap::Delay &d)
 {
-    debugs(93,3, HERE << "adapter needs time: " <<
+    debugs(93,3, "adapter needs time: " <<
            d.state << '/' << d.progress);
     // XXX: set timeout?
 }
@@ -679,11 +679,11 @@ Adaptation::Ecap::XactionRep::moveAbContent()
 {
     Must(proxyingAb == opOn);
     const libecap::Area c = theMaster->abContent(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 c175e351f79b70819481473dffc49d36536ccf95..84ec2f79d89baba3e982bb3e5545599e6f679dc8 100644 (file)
--- 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 5d20062b911a1699cbf20b10d85a31af37a67425..4840bd323dda398c7c94d7644272de36416dafb3 100644 (file)
--- 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 3cabebd09a33f981df4bfeee9340dff48e6fcc52..8b4684ce6439519f632aed1d49856e938822b7bb 100644 (file)
--- 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 7e79579d49638eb993fb5eb30a0d44e59e584b99..b1a7ffa38ac6f296595055492b974c1b67619a4f 100644 (file)
--- 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 b0c0f46d89c51d0511f1c4165a25f7734cd995ab..efddde3938a6256afd9f4ae68a445d55271edfc8 100644 (file)
--- 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 21e23b0abc05bbe1dc4344eeffaea3d4f3bda386..5935f8f75934ee94aa910a4f792df00d5b99e0d3 100644 (file)
--- 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 201679ebcff56ddf033d9165ac022ace84c2cf65..eb01998584f758f0dc1ceb2385adfbe7d76c7167 100644 (file)
--- 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 b0e604a12739e0207b940ba5c2506eb6ac2f038b..71e2e81a9d3d130c59274e3340289b97f1a24c29 100644 (file)
--- 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 2e53c8251a2ac120ccc557b972d7f1a5f1114ba6..a88bccb0e0626a30f6e7c45d0cc8a6753bf3487e 100644 (file)
--- 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 cdb25b7d1f4c6d014defd6620c5f5587882e6ff8..8f4f155c034d2c22c6feaab3f6a65e93fb826024 100644 (file)
--- 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 5c1348e3ab4ce6331d179b10aebb19c53b151039..8e689c411b5cde66771789b44f9092ed48d327c6 100644 (file)
--- 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 a38756165a5e34d7422c9c159c89638adcce27b1..9d5d8d7a5a01a93edfeb9d3db227541c05bf94e7 100644 (file)
--- 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 6936115c8697ac5d3e21c9e9d462b73dff846bf1..20f632debe809980c9269388ce444f83d9bb083a 100644 (file)
--- 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 08d0a621221ba8da55314a231e82f4bb97fc436f..b9b0c5ea92737bb4d31735942723e95ce3563120 100644 (file)
--- 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 e16314c889710591fad97d8c71d3d317ee8c8239..e62d2c3c49e0500a9fca8a7a8adaa6997eb0423c 100644 (file)
--- 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<size_t>(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<uint64_t>(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<size_t>(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 a976fb3bdf8e24fd2ba3d79684f899215f667b1a..2fda1318b8d6cc4fec46ae41da71035c27263c12 100644 (file)
--- 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 f8d0aee752384dc2c34b0d13573125d2f6570f37..0e36bfce5897999e59501ea90c9cdef78a82ff0d 100644 (file)
--- 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 3e033637d9a14fce840bd9d91d66f9bb5445bf79..725cd6225e55c8f64277c0211b4f71ef7c9c03fb 100644 (file)
--- 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 5519ccb4677fe4de21db5fc7fff6ba4fb2cb2812..0bbbc6c227b54d306ab0650f2254237302896316 100644 (file)
--- 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 8509dedce540b37b9a46f10bc7dd3cb6aa7643f1..f3c44c60b1381a63dd99c63976acc858eae0b2f1 100644 (file)
--- 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 612366e576f53d79d6e3a18b66a0af927f4162ac..967e6cd768e1805011413323ef5513bb0c523849 100644 (file)
--- 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<const HttpReply*>(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 d7cd604d6963f86b05afb955d8e5a625d8fd499a..cca2df4ab089c1948be029c9998ee4ae52c0fb1a 100644 (file)
--- 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 e98cc5e60b57bf2c8b5b212218e262c140ba134a..a91d0c56ea45e858e7136eeff2c8d3740d4be39c 100644 (file)
--- 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 9c2742149a20942d1ae8e87dacd971202d0d3818..31a6e22fc9ea274a2efc01e4977fa68b36b22643 100644 (file)
--- 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 6bb5a6d6204eb2aa6aae427c94710dbc25c896bb..1fddc371b57650735f59ab102e56f3410500f4b2 100644 (file)
--- 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 ef777cb902ac52c5a9264639e558cc881286a757..b5f20e29c0229685c584ba9db57d63bb006e7795 100644 (file)
--- 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 02894dbf0c14f9b3e1d3f45366ad48c656c1d981..12b9c40cde2f9785ec1099e7e963793eb70fdcaa 100644 (file)
--- 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 0c77b74a0573d25ff37e47767cd3726d59a6d24a..f65f19293437043ca4d76fc4c0927bd5fd61a573 100644 (file)
--- 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 6a86396b5c5c18ff5e13e7463f50ae86ac10038b..5aa0100068f960911afe9a3b2419179f3ce77976 100644 (file)
--- 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 5cffac33a59c40deb561ec6d6db4609ba6775a06..93bfbaf1d6443b0a2877778a7cb26e6018979648 100644 (file)
--- 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 66f7bc2d9f55647d895c0e5cfeefca1840178b08..e736c19a3941d51b57f10da2162584a2cab5b1d0 100644 (file)
--- 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 ad1bd44dede2fec4b1d3b5067083d172c2aee4d2..9fd04a58c7b93382e0fcbee83c32563ec66e79d5 100644 (file)
--- 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 a18ed955e36edb08fc126ae0d116090844ddb30f..ca7ab719ae3ded6ef4d7b6cc0ea34212583aaf8b 100644 (file)
--- 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 7fa98a455f67ee6f2114c2b12065bf00020b7871..aa6b9011e1057d8eec516b1d1ace80f0f930bbac 100644 (file)
--- 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 bb29734d8b20c6f5bba922e0f67942098f871821..df83b8bc6463193c72ffc06abdd094fc23f7423f 100644 (file)
--- 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 180d3fb61333d569da5820dbe9db8eccc1250341..ef8c71cc28d2933cb052bf469f813d32a1c13ae9 100644 (file)
--- 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 35779c4c5454db22c5080d50a5611bf6669e4ff4..ef82ede57d116cd05d16c45ffc8f82f1283c23f7 100644 (file)
--- 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 ef392edfd3d37d79c857e2372fccacff5028d2dd..c0d5006fc86be82bce034b6c78b0878b73a1b2b6 100644 (file)
--- 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 c744acffbbba0a45e19e1014694f18a17c91f6eb..2df1d3f304ea75d0651af75a3989b6dc0309660a 100644 (file)
--- 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 2d5eda8ee13f0e6d33e87ff66e7d7c246e22bed4..5e4d3d6f4d161e3368ce2eca6b27185773472f18 100644 (file)
--- 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 0f73ebe19d1469de2e555284c8f8ce6fd3da8a94..f2fab8f7866ecf472578ed36573dde9a1533c05e 100644 (file)
--- 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 a999767b742de0c7f6245323ff78041686384568..9669fa5a1f5eaa465ddcc4ddb22a89ff5ed208eb 100644 (file)
--- 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 797a07c080643c87a5d408f694d358f4993e6d2c..ce9d4cbd50b9813b62c8a1242fa2a5c4a8f23150 100644 (file)
--- 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 ea68538087ade68a1c9470b300c49b47b626870a..1247230e1e44e83555375c9bf353b2f566847197 100644 (file)
--- 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 23292088c82e9fc157e4c379144a0bfffce7557f..f65f1c974755178e471452c5fe051221bbe4f6bf 100644 (file)
--- 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 39ecc2ee77320c09fad33ff42d09b815425116c1..64b74db45073fe9b919c04683f7a8c5a89f4f038 100644 (file)
--- 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 748e79bae4915118a694928535e69d2d5600cabd..3d29da748ec66eba6244d7a236c0303f5acf1ce4 100644 (file)
--- 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 b0c0189b3731d6a2ec2dca83aa6819f0fd45242a..fecb0721224c30f8bd0973358eff5b5cc999e4c2 100644 (file)
--- 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 e2a3838fc9f4bb9c7aa2083546b0b4778200812e..97efa09c522877a2f98e2563bd6f60cd381e6c17 100644 (file)
--- 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 3c44849c14182e4ba842be06c8e9011277fc35c0..0169347a4b6899f49b75d71ac73059af14efe4ec 100644 (file)
--- 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 b0223c39d604121626939941a4c294aa5d45285b..15c49a8c8dc573a714c4261d69ea8003b75cb952 100644 (file)
--- 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 99c05baf39f57a150c25074576e93cf0ae13d280..5a80d6c88e3437ee925094d66163781eb9225d3e 100644 (file)
--- 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 fb69f259188635dedff09e7f7c6aff3b73093fc2..f5736aebcb39769ad86a68d1913d9d210a93395e 100644 (file)
--- 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 d3f61da523affdb3ebc4f3168496b4fdcb7b84c9..49051280689042cf07dd8738766fe28ab90d266b 100644 (file)
--- 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 a887608811b68a655dad0d3575a546ec04681d60..3001805bdd459ffdacb4545194131aa1c7dfce72 100644 (file)
--- 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 1a881032393b98b06b66184b38a932f5ca19f1dd..7642ca58eab38ea12c2916b357be543b0ea65bd1 100644 (file)
--- 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 6a6216a948aab0759b59fdcf91335d37c001c055..6f1924fc39ba1d075db2543c703b96ee39ce5d4c 100644 (file)
--- 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 12a3dcbd3faa61a78b310535ad8e61f8286f1c17..1728792e3ec89b0806e9e61ab161e523b88e6d73 100644 (file)
--- 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 22b3ac76e282a4a0687e1ae29d339f6899bf8204..0ef52c45f78ad1c152a1146ac25e894ce2b80a65 100644 (file)
--- 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 fca232d1e3b004a48e4b25991b7d43761750630a..1f77c3dd6d99c936beb31d612dd0aadefc8d11d7 100644 (file)
--- 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 ca14700cb026db30f05f13a5e0e2ebb1590e4419..c862c9c32f55521c6b25bc437c28e3172319fbff 100644 (file)
--- 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 98571a2a8fc27150940f35e6cf47944b026f0056..307c36d8ddca77f069c7a5ed068a7ef8959fa795 100644 (file)
--- 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 39f58b412661ab55a0800844ddf5f326beaecfd6..ff49175a474baa3604df4ace883e54cb0ffda17c 100644 (file)
--- 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 67d3590b330d9e8e1410c942e54d3991255f20cc..a1a429bf1478ee58cd0cd5fdd90d95fb0a6a4eb3 100644 (file)
--- 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 04dd03f9a920800229e55fcfcc0fce05c8ba0781..1b6fa66c5c704783982df98a9f0131d1088207b3 100644 (file)
--- 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 388fe64b7f80be442e4e1fbf6d8a268eeeea1821..670da2ca03b5b8272df64c7a71d9a9c120e45eca 100644 (file)
--- 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 9687bf8fadbf35d48df0c4c640f566ff13a88576..0cc13bbd91f56a8c0b7704489665dc02eb06b162 100644 (file)
--- 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 547e540b1d7da59dc9749afff38903a725df80a8..485d99d72a4496c2c7670be1ea32045e84ab9c3d 100644 (file)
--- 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 <oec@codeblau.de>
          */
-        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 e126faec6db0a55e2933b48843a83c0d21597115..878cdabdb5885211e2bf0382f44fb77c1268d5ea 100644 (file)
--- 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 1147c5f14ebec2800ca30ab23b14634e97577af4..a7da053c0ed9430f76a95a8548a28505b4f295aa 100644 (file)
--- 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 b21347569727d79a470d654e6d47977db66813c2..98279c418e00669358054cbb7b56ef86d8e2749e 100644 (file)
--- 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<Henrik Nordstrom <henrik@henriknordstrom.net>>
 
 =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 066c401fcd22322078b99db731fed53b02b32574..9859421bb7f79693a775411c8fc3ebc7a77a2497 100644 (file)
--- 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 56956450cd7c68847ac562faa3372c689b2b4e9c..add8fd88725a356ae345a180715df39700ca4e78 100755 (executable)
--- 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 afed66b25e59bdd50a9c401471cb06c3453a43ed..9e3b204a91bcbf011813fe10a65b851ee340f980 100644 (file)
--- 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 e9fecb0ec4f83d029787f199cfbad35ffec40e24..71a4f85e4dd052af3dc2b2820edb51ce34b7c43e 100644 (file)
--- 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 55f17c2b252ae7267134b16c33df4c697c949c0f..407585a46a2130cf5124608901045283886259fc 100644 (file)
--- 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 4ac5274deb3d73998810a0f976997f1fc01f9a8d..e567bdcfe32cf454e5405135ff051c0e7363b784 100755 (executable)
--- 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 c1f2cb96cf7b5885ba479d3c21145a718512ef12..7990fbd972dcf94e144af65404bd9b76df3e07d5 100644 (file)
--- 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 d5cad6288955d61a428626f4e45692cf9cfcdeff..7963aa518972a9704b3e621b283ad621f73d9477 100644 (file)
--- 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 82cbc86b2a6d9fdcb16dd95c5db612588dcabf7d..ac3eb0ee1f267a343569e13ddb11431065dd4704 100644 (file)
--- 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 faba7f7c663587e6e22cdac8a17f25076111512c..11d721f6161c7099d4651133eb40ff5302417e8f 100644 (file)
--- 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 5ee7e56cd4c19b49725dbfeb4ca12cf44d95b611..ec99aeb991ef54c10e99f365d7e17d58bcc9ecc8 100644 (file)
--- 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 39b80b8cbe99b1fc97b73aa4cb80a64b8e92d517..3c55bd176f691847bc5e8c7aa607920061527ad8 100644 (file)
--- 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 043055fdb4d039a06aca841f1cfec53a3a437551..c4e900d16b12b7384b3996ae7cd2a728289a18f1 100755 (executable)
--- 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 dd6543072f564baa49acae37cc37bd499cf04011..9b9252d2c0f31965875a8ab96f773bf584dfb853 100644 (file)
--- 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 07212408f3ace0c74dbaa797322a559d3c706dc9..02ced75f5570fd06388377645ea9832e6a6dc89c 100644 (file)
--- 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 c067167bdbfbe6dbebdb92881f61590272077fa9..7a511f899a94823cd5638449fded08819d4a5386 100644 (file)
--- 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 f82af7c224d11be563e701b5e136014443530533..5bd0d974030f847bdc29c611fc04d3bcfb417992 100644 (file)
--- 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 0a299db3cb9d75fc06ae16e8b39964b40e981779..be6b8906c8d6b79cd06004ba09105b0ee7636773 100755 (executable)
--- 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 9e25ce19a13da2f9889ef8f57a0592293b594251..7a6d0121f2928b15a1e89ebc21c3dcb73e4d1a59 100644 (file)
--- 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 b9897f8be5c26973268da1baf419b3241dfee23c..58a91726940cdfe0bfe91222e1abd70081b39c51 100644 (file)
--- 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 8d1790ea208b1c747d9e8f9ae4c5236ac8f1e5ec..b54ae2e37565b3dd7bc4de1f49e85718bd39647b 100644 (file)
--- 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 0486e007a89edd03cd6e29fef983993c07331963..2061a54b8fc3c1a1d05160d454445c6caff59666 100755 (executable)
--- 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 1a11c213f0e0f2b83d1c1fcc4ae8c20d7d4c39ef..f779c182b1d3aad3ee7e0dd7715dcccc679691aa 100644 (file)
--- 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 99e296b8bd72608335ae37b3148d0554d2fe9a8c..868309153b8b88e92732505b497f438992901fb4 100755 (executable)
--- 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<Amos Jeffries <squid3@treenet.co.nz>>
 
 =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 c225761791b7c703a155be3a036616ce7cafb0cc..27630696e704cf46fa7c6582e8b50227aebb4f0b 100755 (executable)
--- 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 d84ddd2ea6932f4f2df69aae0a54cde5b0b415e0..4f7cd55554f67115a5554d0ac1c22f67b5a4f4e5 100644 (file)
--- 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 301c33bc0cdf9ee045c151a37dbde2b43a51e61c..cd2302a92becb5577986f7d7bace3ae94e5cdc89 100644 (file)
--- 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 9b965b0a08ecbc32c545241807de3d8d68a5c128..27264b6ef3e77383531cf016ba601a0dcf793b7e 100644 (file)
--- 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 04e53d1ff37dc6982e6cad79c33ef440b9be0dbe..758afee3c84afb52d155eb0d737c19d011c5b022 100644 (file)
--- 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 f4bd52bda243ad07579721d798b2e19dbaefb7f2..78332a50bdb1c6c5492fceb9a40dfc9fcdbb6856 100644 (file)
--- 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 465e15691aaf9a232db7af402b136ab70f867a25..fe2c2d3e77f064b0f345799ae56782043bae1458 100644 (file)
--- 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 ecffd502037a79107e111469616799399cb6bc20..c1afbc2a42e7a0faa11dc8bafbb13c1c2b60ce03 100755 (executable)
--- 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 abbe635a796795d42eb2b95484785c0e0170b77f..e74ddcf12c99f2d2fc186deded64b0e6377d93f1 100644 (file)
--- 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 3c9c1f7c08bd86099ec7c22cf22e06f70a6379c5..dd4cfb1b22f460be1f8692667157985527db9668 100644 (file)
--- 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 e83cd115aa9eaa262955c817fed9607375ff1f40..5468e1c31179c721b764dee2583914376c2f7fa7 100644 (file)
--- 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 c7fd0e3164d6589531302e066d29bb0d9ba73910..d3effed6836725417e477db52a236242d16bc487 100644 (file)
--- 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 7ba22fb71ee3c26dc57daaaea2d810c4a4b2e6b5..943ccfdb9fea4db9bbc824ad0f6900e92b28254b 100644 (file)
--- 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 6b9bc7038f21b61b4c80909121c28a562f8cb7b8..c69b34cda4f13d89382517731a0ca4053b18fd68 100755 (executable)
--- 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 8458d611232d5836b65dee6692d5f43df27d4ccf..edfb8bca174372bc74ad958f43ee9f6633cc826c 100644 (file)
--- 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 24541b7fc23406b589eeebb46dc79866115b91b8..7809ac278909df4f58b6881ab12122bcc712b45b 100644 (file)
--- 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 a2b95e85bde40911b14eb910f6cc8aa618c52b51..cf8e9f0b2a1931d7b8b7fe8741b0edff6adc0962 100755 (executable)
--- 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 2c9bbda2b8e95c0491c9bef742bab6b068d46ce2..3a2d68eeab11189cd668f681c51aa5a4d17f6dfd 100755 (executable)
--- 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 4ad891365735d62e9cf0af2fc9f973cedfaf1e64..d92e0b7c7b7bcb0187b4e4237e867cf256fddedd 100644 (file)
--- 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 6be8326f3ec69d72eb4cc7268fce65327c40bf3a..3e8cd89f9667645cb2310747a20b3edbb07f8766 100644 (file)
--- 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 36e56d0a6e3442c22b2db30321a0aa66d1074649..9182c728b15bdd84f5dec6b4a6deeba90e9a61e3 100644 (file)
--- 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 3304a09cb4f243fcbebd60b54c9c882b64e117f7..b979f2c468755ce975f5a9a003d6e71554b38917 100755 (executable)
--- 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 9b36871fc06dda5d56fbd4ba8f2dee656047d47c..8faf40cbc56dfa5a4035e0f969aeb22366a6925e 100644 (file)
--- 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 c1f607d6206c0be06be2fbafad9bb9c258704e48..9d8845ab6dd7cb56f370278ddca6f813a817a668 100644 (file)
--- 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 cfa2b4104d6b2ab8d468b83943889f797baab4a0..9c559383f66e8a6a70a5b2474033f9280a6e0b25 100644 (file)
--- 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 e8e76b44935360cddb858cd3c5e100ff6ace9928..9346133c61b1a5c35428e0af7fe90e201d2ea3e5 100644 (file)
--- 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 6e13fe47c3880e5cc5e1656e4c4a761f68e75752..21fd79e8fa0ff367307699735180344f21f4a273 100644 (file)
--- 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 74a4999323d31c885a811dc1e662ed4cb7ec205f..d5490645ca47e432b60b4d21ad1b21436893e6f0 100755 (executable)
--- 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 55e3b58e208b2a707612c36f91da48ea8fa71809..4fea1f72721f15a0fac04983f1d0bf6d2424d6be 100644 (file)
--- 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 b604f86bb0dc34f8bb1ff4ae3eae1ef67eeb9be4..bad5fe2cb95111cc18597608dacc830bf6998ce8 100644 (file)
--- 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 5d8161a898a925c896e90f4ffe387fe7b3fa7f32..47cde30a856560e70f0ef9574404c5f620bbab71 100644 (file)
--- 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 834ab58aba25666a0a000986307544243dc4249e..58c712a58d5f67c41b68044bbd87f5d357edda04 100644 (file)
--- 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 e0ae311cdd7749cf655d6bf4c0ccf7c29715e138..73d0280b46b021b40f3677b66205ab9c25bc6f46 100644 (file)
--- 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 85c5a7681c21180a177956c3e86039ee8378d602..e87a9ab7e21eab54e734067d85f418ef51e48ef6 100644 (file)
--- 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 7124b44f42f1ade9a97ebacbf10b11f5bec97fcd..d2086196000196c6025951965ccb8e3ae8703e06 100644 (file)
--- 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::Basic::Config*>(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<Auth::Basic::User *>(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::Basic::Config*>(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<Auth::StateData *>(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 a7cc455c8e1b5fe0d58fc3fc62023af3f4de48bd..800755cfdde3958933ee326a912be7fed412b2c3 100644 (file)
--- 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 718ef50655c44865423207b8f1a5eb771c9cc46b..76ae0f89ee206760fd4c704c371b62541ac3e9ec 100644 (file)
--- 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 a8fead0f1d460f399cfc7d36bf0dbb134452a3dd..8fe060f7999dbaffd885a16a0dba27e6b5afd860 100644 (file)
--- 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 19872bf5c890c22553f3120c89f6f95ec856b31e..62ba618cca8f279efc42748ab15c8e2413c421ea 100755 (executable)
--- 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 7c2feea80beeb93ca9530820df424e4f2043d0bd..caaf81d7d26a51f59849e0bc7b860a1eb70946a6 100644 (file)
--- 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 1bb9ca4d17897425a8223f4682f57e00c9c90b70..2328475bf08582482affe8f32a29479f9e4deb09 100644 (file)
--- 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 79620303af06cea44c48039ee6633b58f805ee80..6a9164c8dc7d39030404ec1e810c7b776a6a8885 100644 (file)
--- 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 5a9372157ad5c3a127e0e2a9fd6ccd3cc34d880e..29508b462af8fd5a0a1a8bff3b169fa0ccee655d 100755 (executable)
--- 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 2707238c67eb323d020f7e17e44fb1f2143b28fa..9d51160ba1c0f006589d0f7c927cb4d59291250d 100644 (file)
--- 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 968e242c85e7c97a4916d4d93ac52978ed47fad9..c785bc3cb9892d88c84db370fa0fb301385ba754 100644 (file)
--- 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 5bbc1b89c3c0236f9fd62b19ce3a7eeecdb9422b..9d3f4f377cee66ca83f90965454b8f280262b09a 100644 (file)
--- 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 dfd3a22fd334017a3a8c30ceb3e397640fb60b6e..c4afa43897256e05c345e13295a08926e1013b38 100644 (file)
--- 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 17302f7955f51dad80b918ad0575c81a30419fea..ae7ccbae25b1de65834d3f1f840a79ef4a79e960 100644 (file)
--- 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 f5209eae9a5bdc99e1c07f49e4dc25f68dd7f58c..0932a0cc662b0fe5fe7944a97302c0e250e69f7e 100644 (file)
--- 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 ac511461cd2f04b3ed72647c2b8cfc25688698bc..b77d9860c2b53dc96649cdc124485fb5b4221f87 100644 (file)
--- 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 977031c2e8c881c496d21749e712bf693be7f272..e5c09bb26a1976b92541fd7e25ef5edbab31c851 100644 (file)
--- 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 4ac5274deb3d73998810a0f976997f1fc01f9a8d..e567bdcfe32cf454e5405135ff051c0e7363b784 100755 (executable)
--- 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 2774797594649c86188f07aa1963f2c2596b80e3..23921feeba580380c9757a36320c366ffd99d935 100644 (file)
--- 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 ef46f0022d720371779e1772d0e31d210d87dc43..ad303d4a718a78a072dabf6141915ae54d89999a 100644 (file)
--- 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 4266334371deb9ece98170c06c2d44ec984390e9..1f62adbe582398b80f11c87a6de101d282210dc7 100644 (file)
--- 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 9c2f094fd1168f915e9025ec0f56a1affba6e9d8..a0b915724206588d92a1005cfa68de316073ea6a 100644 (file)
--- 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 507677b21484a16256bec416625ebae25ff03a12..c9135eb9a0632f718beff6bce9e983531d16a8f2 100644 (file)
--- 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 9d7bcca046de53746a8f2d64b6ed368ec31df73b..81cae2ffb1ca8ec740399ef350e8733e3b597ec3 100644 (file)
--- 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::Digest::Config*>(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<Auth::StateData *>(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 ed414c51b58062f2c24b96dd09afa38756915369..afc709d5827c17097d9b544760ad3136f5934521 100644 (file)
--- 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 aca43e643f38c8bef7ac735df60de40c10cdf314..baba329ac68eae4278f48ac3714c44b80010cf33 100644 (file)
--- 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 96bf33d9a83c00309234575928b37d3af0a3a333..e88b0dd87fa9d7ed57bd2321226c8329adb48bab 100644 (file)
--- 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 94d87636cc9988704bbf5dedf351525af1ba18e9..639cd3069d20367cbe0f87cf2d4219098fdd8889 100644 (file)
--- 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 fff0115cb1527a2b0e246899eb677b6907f5eced..439c9c020637ac8d624c8a8e718b3a2b22b68739 100644 (file)
--- 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 76529f8104508c2e39aeb12a46c4cf9a23f4e15d..fd7a412f253f4e50cb99934fcdeea4967dcc6dce 100644 (file)
--- 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 5827af6d7ddc0f7a09162a9dd5e1c863970bc667..feeb5dc5169b7942e2a51b833e59bbf32298f9e3 100644 (file)
--- 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 62f954c45fa27284b09418fec5b6cdde6f4c7275..ecb7d8597baee485b9282eeb36cee7a5dacef645 100644 (file)
--- 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 ba987dacfddbf0a6e396de35e78febba81f3ea80..66214ed334f94c82da39dbd5e7b4c2cdc77c4297 100755 (executable)
--- 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 549895b972d90a746c388b1478b0378e1805c92b..235d3293e47b9fa94650cc7870478761fbe82523 100644 (file)
--- 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 ae4dbbad4e4e9b7bdb10a424a2fc86e00739db57..b857983c917d9bc7e666f32770193585d324d2d0 100644 (file)
--- 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 47332ca65a00fda436f80b0f6b50866f8c2b0e5f..306d41939264691d4ce66977bf6a448c52dc6d89 100644 (file)
--- 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 2ca80677ee990221e25aaebe1de6457712b78b59..c552bbae3cfb44cd8c6bbb14b15c70b8b5b507b7 100644 (file)
--- 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 31f5b079ccd48842f10189fa69a348b96040a96c..e06996df4adeb38f129df9195356bdb8f9b3d9bc 100755 (executable)
--- 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 487747c84822d54fc08dea57c96cad4063c6c724..7e8bf6b18c0cda9c09d482ef8d18ff29b73e96e7 100644 (file)
--- 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 7b7c3186a55f8c046a68dc424af64a65185c2848..57f58ebd4bc1e32f66ba9190c4693ab513baee38 100644 (file)
--- 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 c0df5efc70d66937686953271a17486901be388b..6b1176db99522a7fee13e4122b6bc51cb9f1638c 100644 (file)
--- 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 33433cc856efbd6ebaf8acab9076f78b637444e4..abbdb0988fb25e3dd25bd0f659c3f6a9ce0782e3 100644 (file)
--- 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 a86084b780c964ab08a88a87ffd49e70003f7671..b1756730e16920f2ac91898d03352d615c8f6418 100644 (file)
--- 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 130471ebab7033f4a9f68414759ea3a13074212d..ebdac77811a852615c9e9f7e98f64b57101ed361 100644 (file)
--- 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 00aa2fce5eb6f2cb77217a16db1fbb6a2ef4446f..6dcf4b0420f59004360fed358d9c985262cce197 100644 (file)
--- 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 b86d24defca45aca31af618acb7b17b7f7e02f70..6fa18218cc986ead69b8df52c39be745050fb427 100644 (file)
--- 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 a9d7bb75687b827f410fd30d0ac2105e37174284..e4962018665ec586044af34eb7024e3910967978 100644 (file)
--- 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 e37afca158e0d5c27593465ea7857a76fd97d032..3f161b10b2b221bd7f5ee93ba9c161e88601a063 100644 (file)
--- 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 1f1a3d54f1d720e678d6154651fe273120a0af55..d8055c2362be918198a1a6f698546bf8bfdd4855 100755 (executable)
--- 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 724620379a0e3f7f34fa743ffc1daf0cf1e31504..d84c58bc08504747839579bdc014d8ca1dc44400 100644 (file)
--- 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 cae3d7ea1aa49d4f38932d45e291a40bf89695d8..0610fb42a996e1167b933bba29df33d7759a3497 100644 (file)
--- 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 8473c8c28a3d6191a65d5ddcfa577bf28c1c5f5d..f4da71dc532d23591a114a2dcfdc76a60f555a39 100644 (file)
--- 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 0f97659d3708dde5810bf2a17f134d2835e08b20..bd56a5576737c838ff3263db1f293f52333b3f37 100644 (file)
--- 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 3965e1940378c420d452399adc7be120510bfa6f..e02fe56d475017c9f374087d0393412c3826843b 100644 (file)
--- 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 54a30d398ba29bb23582b56665346181a8b89fe2..ade8a98e12ab8013978b08cdac1efafe830085d5 100644 (file)
--- 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 2d95736b957a09d6fc1f5c9594fe31fded926171..b2a972f01e3c8ff06ad18bf8e603ca9a1efcd1a8 100644 (file)
--- 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 b2d99f3e884f2184beccad13f2e9bfd7fa81caa0..bab99bc635a12f2330972442ef0c775116ac4a64 100644 (file)
--- 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 76093aa474efa0ddd657e2d326c4e48fc5c3b061..dabd1a263bcf61a915c2ed35db71e40d96454da0 100644 (file)
--- 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 4e618956286e7a70dffd8a67842980bea514974f..0b38be7bf3b0d0d521248cb869963ad1feb12122 100644 (file)
--- 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 89532596aba49eba5b7acc59068e899fcd4a06f9..c1f640a788313e5a03e4e7ce8a454fbe215a02d5 100644 (file)
--- 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 b81874930e207addcacf5c3b313700f89ed2b340..4df0ad2f9f6ffbaaf67d607d928490662f71d815 100644 (file)
--- 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 f3108e2dfe076ca643ebe5eab85e7b10f1b682ad..c716864233c2899e10e12827e232d64cb21af4f5 100755 (executable)
--- 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 01dd75e9647f319374aac81a4797532f17a6521f..dc610b1de0a995cf21e610a70f9ef9293027f18d 100755 (executable)
--- 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 f2f6c8ad8c52cb0f798e3d590810f148dbd8204c..c158ad007a10da8a96fe5fb82219c9858f77acc6 100644 (file)
--- 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 534b61a22177290c411c1113a522b1d057ed62e1..7f53e2ba619f015d2ffaac70885978d7327c8fe5 100644 (file)
--- 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 f666158a8a13a36c97db4a76232c54e8fc31beff..ad7ffbc3e9c339e9ef2a4a854c398ac0400f3abf 100755 (executable)
--- 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 08ebb59a142f80d4e5699d94cba75bb69f00e4b3..4ad5f68418311e39a570d48b17bc9c50771fa5b7 100644 (file)
--- 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 332a17732a8da8722e7c681b5220995b4d7dd6aa..b98cf1d62f90b58f0569a724d9d77f767456e173 100644 (file)
--- 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 9cde618f219a67cd4f44244b6b06ca420fe369f7..497fdd5656dcda626985164f284871f91d54b7ab 100644 (file)
--- 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 97cabf6138bf4a1de04ba80f398d155d7e72db27..a122a6113d8886055e1ac8ee8869ee0996a2c858 100644 (file)
--- 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 7a38dc4d1b49cd6abf59b47a2eb8265c9641df3c..e26d1e10597bf8d4d416b8e91c42a8e83c946475 100644 (file)
--- 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 9e39cee2b7bc6e4ea374e35a4330d8c44ebd9466..fe906bf40504123a29e0d8c91ccf074d60fd3801 100755 (executable)
--- 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 f98db262ae791e67a823cb5a2a7d59b49013070f..3dedf6b5126a01a0b6354d90c2fb964be75f5de3 100644 (file)
--- 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 fb3607020aad28a8f9ad6cad93faca64ba9117e0..01f894b8fa10f0ba22de99419cbbbe70841e615d 100644 (file)
--- 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 8c77d13033b22415f74f60deb5670df31bce9a7c..ebf8bb3a0ccefde424bcd7b6ab49127ff1c05092 100644 (file)
--- 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 1f1a3d54f1d720e678d6154651fe273120a0af55..d8055c2362be918198a1a6f698546bf8bfdd4855 100755 (executable)
--- 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 03e8106ea2f7d7716ab80997923a59a8b7dbbc37..ad5f93185988343829ce6608f6b0fe2e27fba81f 100644 (file)
--- 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 a8e010c4d1a1f31cca22f27b952c975d690ad167..68638a3073656caac7141169063e16b84362604a 100644 (file)
--- 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 6a61b4ef37f96d4bbeef03f716d69764a9ad1306..25db6a8f9352490faa171292d68df9e299f7aeb2 100644 (file)
--- 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 7efe1b6452bef44b1f84a6d65f3872e216afa0aa..ce8cbf1714aedf22e0693a5fb0e765275ede867d 100644 (file)
--- 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 7a33cd4281bc6b59e64d27ee8578e271ac3f76de..a41a48af257c8fe6c8a66330dfad3224f04e40da 100644 (file)
--- 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 13843d703225e46cdd000fe5c34b1c4cfa50445a..3ad2a3fcad68a9994fe753033103368e8afb9ae0 100644 (file)
--- 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 40589f059d3bb61bb58b05c435d5cc9f32a41dff..6d7230aa6435b396eff5178f841abd5987e66f70 100644 (file)
--- 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 3738c82525230cc43d801eb96b5c76adfb67b66b..d4cfba79203c2f61c0b0f94fdda50ebaf00ccd61 100644 (file)
--- 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 ebc36caaf0ea30401a195b8a410c563c42918ef3..de3b88e92e7f923c6710436b933b6707a3fb9bd2 100755 (executable)
--- 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 19872bf5c890c22553f3120c89f6f95ec856b31e..62ba618cca8f279efc42748ab15c8e2413c421ea 100755 (executable)
--- 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 17473ec8027e6734b1f57edbb679290ac49347ae..0c9934f45fb216f6d49e9be369279500a28b2bce 100644 (file)
--- 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 bb94c8a08cb11a7e9ffd98c4842fe4a047d36800..0d4ffb8799ab48ec74617a6fd05bd10da7754b17 100644 (file)
--- 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 bde1eff9e8118014039ffb7864909711b1aa54dd..b0644aa9f562149f9ac8a934f42fb5adc06e395e 100644 (file)
--- 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 d816eb844825b081312d3f09e4d35e83bd6be8a4..41752080f73151119fdd4111bc61bad9736eea7c 100644 (file)
--- 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 942887312e4b780dcb4ab151fbeac968bf476764..1b3a32b027acf7ae2c25d78576dcb022f5512652 100644 (file)
--- 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 05435fa34719e905d78e3b74cd12d55951543a4f..ef6dca425fe609b9e7ca64676219c5790e2fe546 100644 (file)
--- 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 402cf4e500aebdabec274c8ddd024de964b8ad93..6e13996da39653c01c45b40a81cfd7ecf0d9c712 100644 (file)
--- 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 18e0c22ab837a3a05e637c6fe6419b0852992c6d..dceae34c28f3271158d9fd350289a9a20dc67a34 100644 (file)
--- 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 7ec0395c4381e3e0a8ab331627d1b2f47099cf1d..7ed3cad8076456e236fdfc66e589a618e41543ff 100644 (file)
--- 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 795f8d9fddd2e3a98e15feefce3306b240ece6a0..24394f0f9c87bc262f10f0445bde6cfd0b07905a 100644 (file)
--- 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 b0e4abf4dd84798e0d151fdd5792bd9683d28c2e..a46e300713c489c29884f5b2b43528ce67ccdddb 100644 (file)
--- 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 bb7568523eecbdc2e186613b46d0aa216960d772..70fd731ddcc72557904e40b053fa83a695fceb8f 100644 (file)
--- 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<Job>::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 1437c22bba11b579e82da8e64033d5d163f55c84..d8f4794b1a56daf5d9fb98bb8214e63b5b4701fa 100644 (file)
--- 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 1bd42f3d03547963143d7b68b52aefd962a36b32..2b026a0f32d61fe943b5cfca21efb15f67605689 100644 (file)
--- 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 170d683e896cd5f238f0bbf84f0f857d1150cefd..7388ee897c39be4393468028f96bc3e44444ecd4 100644 (file)
--- 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 d6a3d0cc1bbdd3d25ca2d4eb7255a983a990d323..fd4f2e8f7c2b1f952f097377c87e7923dca7fa85 100644 (file)
--- 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 99c4d22d1d290bad2ff13e4a9479c9992105fe17..c664055f4bc5d48da3bd03a9d7b87d1560d273f7 100644 (file)
--- 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 008b44774de3181551e15b408ad0916b14c2489c..d432758c427d2170248e0e342bf0800418cf73f0 100644 (file)
--- 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 12be45cad691ecba9c840c43026eb27373d553af..6a78375350d0f58cf316e32be9eb832abdd6a705 100644 (file)
--- 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 aa6d69357c274267add1a1fe426cec024bd8ae04..68205c002377800d4f7dbdf0ec033bc24edacac3 100644 (file)
--- 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 f56f6f3fbbdeb7d0e52b6ed44f7d2e25df071d66..91d60b1754ea0893daa967e2ca219bc2f1330b89 100644 (file)
--- 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 9aff18cccfe549eb8ce13900b405b4613c984785..5d88100c45e761e6eea67ef072e8108a70665558 100644 (file)
--- 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 dce6d9de821817edfce915bed0d1c39881b4fc31..458ca560eb9362c6455e52ca680deea87b505265 100644 (file)
--- 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 31ae87d8e6168126afd08fc607928f536845f1e7..c8ee49b2d67398e732f1691162141f20cfcbdaf3 100644 (file)
--- 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 8e1577048c31e782d0cddef4d4571c288746f9da..df36f6df6351aa79f00f16c00141006d23af41c4 100644 (file)
--- 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 0a76156ffc3639c3ed13fd944b8991a7cbad8a1f..0879cbc402372787ab48a6fddaf5520c013f3b51 100644 (file)
--- 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 18b5ce7fe0a4f40880d7c9afe76c15cd9edd2b3a..295179ad6cf24e68400991841638bfce2485c985 100644 (file)
--- 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 9c79df3fe7e22d752dfa7968ca08267eb7bd6b2b..ac1e0e94314522c02ae3938f95d348f6158a6a44 100644 (file)
--- 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 7e4f593c085e28af7ae7c26ceb97fb07936df396..4ea664daa29b88b783a27bd6be727daaff4780c9 100644 (file)
--- 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 ba68324157193cf9880aa11e320d3c945fe40547..67214a18554028e69f4c28f0c3841500fc504682 100644 (file)
--- 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 6b113133198c58d0104f697a1f9d0697eaf1a472..9dc9263987362734f7c04b520ef19844942492b5 100644 (file)
--- 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 7daf59a58f7e0705cd0a55d943a76ab97c624e8e..d86d7f0594d86adc3c4427a675d16bb7ad574644 100644 (file)
--- 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 14440f881d6615ea3689d5cf3c4ecf7aee99a5b5..174214b991a1ffbbd5a66ff183c3975f614fa11a 100644 (file)
--- 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 db47706c5457652b57b49751c3b448b3ce81ffe0..b8476c18e1a705430919f40dffd7876deb42002a 100644 (file)
--- 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 13b8dc61dc342cb3c962c6df3b9fbf8317fb8812..27b9b29457698ee910b5bcb397bc34757519aa60 100644 (file)
--- 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 10ce50d592a27aede85e39c50eb6cbe0badc9a30..0f25434e74f7bcd5b085126dacaa8d4ca850158c 100644 (file)
--- 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 080768c55bea0e491eeac0d617c31b54717c1ec2..867a3f760651df47c78a33a5b25361f7e0dabbb2 100644 (file)
--- 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 9fb0a8a0baeaecb936f298f4c3c3bfe991d0c528..31cf9ee278577ca6288beebe206d9100a88cf833 100644 (file)
--- 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 0df5b190a776166feed869b9877e2cbbe61afe91..ad8485f576f289f656c92b87cbedfd56c359501b 100644 (file)
--- 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 d00680ac2ff907f66277315abf8ef54370680761..e0ec4cb8ed2c97aae1346b63ac6af667f974c2b8 100644 (file)
--- 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 597de0bc6e4e4a91e778b6b22b4cf494f4ccf658..b5b702dc2cf43a71b12d36f5eb864a296cb99337 100644 (file)
--- 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 5983430921ce06fb6489d48fa701df765a78353f..f7a86be5ce630c3ec82f57568d6802e013c3f073 100644 (file)
--- 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 47cef74c0d324aa253c2a9521e4ea1ed95593e82..896bd887387e86860c608f0f65ae6e1574c8f579 100644 (file)
--- 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 2ac1c47bc5aee64a0724fa5afa25cb2948c67f66..efffb0414288095d9c56f143e5f32005a9d16462 100644 (file)
--- 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 6c6c54a227f2ee2b409c73452b443e8965434570..dcd8e3ca9a215d319adf1702ae15555089229385 100644 (file)
--- 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 e8573390a80b0f307ecc05135cb339f66426bc6b..307923909b0a9b400dcb8232bc06d7f32bc198aa 100644 (file)
--- 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 a1b0fc7f5fe2d8d57f0a1ac29acc43d0d9d32270..c9f02049b7faa6125fcec4552d55cda35c33f331 100644 (file)
--- 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 6208cd1ddaee7e4c231cf49ede7f531d687fc759..5fb02ab6763c11947a6033bfeb58dbbcfc670704 100644 (file)
--- 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 085c0d9d597d188f36535e1098eeaecaeb2c66a0..3e95d99e69bf1f7abaef1dea4a94407dd473d932 100644 (file)
--- 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 e14d81c8a3c9bbfe1bdac9ccc7f58e81bc04c3b4..4250c0c0eb0bb59e6d5333f245632b31edfbaaf0 100644 (file)
--- 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 b280f2b3a07c0d179ef8f20cdc3d7538a7d5f5da..9259c625fdca3fd5501ebbe13e6534a3ce3c8442 100644 (file)
--- 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 602b8fb8b09927c5a1da9465d42a9db33c368837..fe2fb6bbf49d7bbae3dad84191f7a985912d2507 100644 (file)
--- 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 b9f8705029416e8c2d57ecde2d1c393b34161c43..709b167b86308b309a00c79c386d055de4f76b4d 100644 (file)
--- 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 793e629dc27f9848b76c3515733f8565c651d3c7..f7c6a99b42ed105f2f7bfdea0453a25d019cf8de 100644 (file)
--- 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 9c2be617de60a77f4411ba5483d9ac262f3ae7a6..7c6ab992def02d465fa4fe9a2ee8885b56890194 100644 (file)
--- 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 710441afaf0e58dd5148a7d3a7214ee007de2a3a..3c3d5d92ec133cd24e26db6a76fa1b608f303d16 100644 (file)
--- 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 ffda0e0de44624bb35ba334fb8890280f1b4fcd0..6f8bf99723d09585fcbe9d6b62b82af904d4580c 100644 (file)
--- 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 35ac847a0afa6d8043d2ae056fc80a84a72b5976..17acbb425dbd843d3770f89c7722af8dc14f9ac3 100644 (file)
--- 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 e7f515a6b1dc084ea77629d9ffddcd328ff928b6..1c529469ba5f9b30e83f3e68c0fc302a13a1e814 100644 (file)
--- 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 483a05f03846851217e8f0d5044aa3fedcf86684..58396c921b0be8c645636bed0b48cb2b8bc429bd 100644 (file)
--- 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 a41d3d645fcbd7cbdfdc39cc8ee627c9bf8a8e7e..36d27a5306c5c2e130ca5c237c1ac10b9b227f8a 100644 (file)
--- 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 5c4623e734cc77a6e936af4ea9045124c2fa913d..bc1ca5686f5f33d1c55140b708ae4b1954566a59 100644 (file)
--- 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 3ed6c644462e3d29e23b45d27bff45d113bf1c6b..bd04a004b6d716cdd49980be2736c9fade51fe90 100644 (file)
--- 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 096c114fd7fecc9465e2ddb9cb80642f3d247c6b..13feaf753c6633651f2b34f221ca0a987e5eae72 100644 (file)
--- 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 a8b11d4c20dedb6d19867d8f2331c365dabf0345..a8bf0a7b2226525bbd5987a4824f5cf01250d0a8 100644 (file)
--- 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 99389b34b93943637c2371d49560a5f24aeb8d55..2fe603998c82cfdff87bad1e3ae2df0a597d3861 100644 (file)
--- 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 74128cbcf3e604dbd265d54e7df12107857b6927..f52b9a5aa0bbdb1d21fc836ead31722405394844 100644 (file)
--- 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 &params)
         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 <NULL> reply.");
+        debugs(1, DBG_IMPORTANT, "\"ssl_crtd\" helper returned <NULL> 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 b6b9133bf3afdbab36b35f1abb335ef00df83afb..891fbd20694fbe5c5e625fa4f49108fcb1cfd8c7 100644 (file)
--- 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 eaa49fbf4fe166b43f54e07c1d507b6581a9ca8b..94edd1604f93d011ebd043be656a6de8a35c0cd4 100644 (file)
--- 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 67d913df6eda098d20331d0d608dac453e946a20..8548b4b70266cad0988ccd0d5e42474ad1f662a9 100644 (file)
--- 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 47dd7ac594ff379cdcb21d099d047bf71cb6a841..09ae8ba42f26df2382929e3169f48fcc452a1c58 100644 (file)
--- 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<ClientHttpRequest*>(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<HttpReply*>(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<clientReplyContext *>(node->data.getRaw());

diff --git a/src/client_side_request.h b/src/client_side_request.h
index e2c3160e66831b1cb9586a747c3bc1ef53f4ac03..bb84835e971d2ca6161e3ed55b4bf29963509db5 100644 (file)
--- 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 e42d3d3c2db758ba9b08cabd3a6c6a95b29ea550..30ad799d6aafb3ee267178635fed7162ec1c5236 100644 (file)
--- 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<Client, CommIoCbParams> 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<HttpReply*>(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 d19cbe9aed79340b30daa03c740277860b12c1bf..be79b395e4af6a793518f76016ea2e223495a9ca 100644 (file)
--- 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 d48c744250195a9be89cd788d282b379f0029abe..3442f793b0d58842304cb7ab52a5c7589b06ebb6 100644 (file)
--- 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 60d8b009d691d53f7b4b85e2fe390ec44b9336a3..4b2dd61d5472a7a8a29b82d5a09b70eb536ab367 100644 (file)
--- 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 a3163eba164754b3b901332e69b1b263b832088b..ae18fe2c291fca5a1d98f4979ef37d5161804be9 100644 (file)
--- 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<char>(xtoupper(fullPath[typecodePos])) : '\0';
+                   static_cast<char>(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 : "<NULL>"));
+    debugs(9, 4, (ftpState->filepath ? ftpState->filepath : "<NULL>"));
 
     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 6e7cc6071d52d77c139084646ff3a767492020fe..768fbce7105b210d3086dcd49526ee09343d3e7a 100644 (file)
--- 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 71457866078ac5017b4d4e25159edcbf0ba05945..a5af5a5d9bc281c3ecc1c6222513853de2ae4865 100644 (file)
--- 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 dfd844e2ffefe4c89884ea524ba281ee26444e26..e88d17610f42cf92ac32d8d9c2dd114b1c586b43 100644 (file)
--- 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 e081c00fa91be7963fd2ad3bfd92eed97fc0b2d1..a46a7095a9da5d13c36eadfb9ce2a43e2cf43c36 100644 (file)
--- 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 8cb7cbc8a89ee44df9cdd47db0c64b8223506b2d..b26bb32aa0d932ddecbd24de3d2db16bda88734a 100644 (file)
--- 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 da0a85411ed4f2ba645b3e96f8977d88a9d615de..c70bf47ce9ba16f3e99d0894f354a1ecae6491d4 100644 (file)
--- 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 c423ee2f395628384019e2b93da150c9048a24f8..82e5eb9bd28150fc0e0aab64cea6c7c04ecec596 100644 (file)
--- 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 8878797dcbf47db0da501472d02e4f51d06fc706..d5b30528b9322107f999c2dd03b0b1bcaf38fc52 100644 (file)
--- 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<int>(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 c27fe0104542b78a2f27385ca35cce18f8edab84..fa4c62a21cfd669992e3ed93ef6e50b2f51d257e 100644 (file)
--- 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 9a33c66192553e3c867b6f06e19afbf8e26b8462..93f417b49c073a85478bac326b2242f477bf4407 100644 (file)
--- 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 95be974fb2534e34854dfba064994f4bcc612a93..b93c1ecdd9418b3940bc865968af4f1d27144c5c 100644 (file)
--- 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 f405f8fd5428a3d637cb8325ae6b5260f08410f8..da709976faa5466ae67c0aa9b3cdf224b824ac12 100644 (file)
--- 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 68ef114ab074e11b8af0c48af8a6b11d0582ae68..e1e60649dc665157e33e5a57c97a4e01bbb0190d 100644 (file)
--- 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 279b1c2f4a0991de54729d2332c99ab50cbe34d7..517831ecf8b93806c654ae8e0b9c43ed47052a3e 100644 (file)
--- 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 73fcc51369fc4d748d16315133cce5b2a2ccd2fe..2d3ce32ea1ebb802a6871cde171730bfd3140af9 100644 (file)
--- 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 391e6341a7c65f463309b1cc84420c6e63466c01..1ea53193f17216c65489b12c5568bb3f28b08046 100644 (file)
--- 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 324688b51660e5c9c411f715cc64ade22524f979..e235a39597d087077a18ad075e01520a4d4ded15 100644 (file)
--- 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 b6066525df642bf4fb63dbed3bb38e2cc35ed37f..5b52f405b82cb9867989637cf3cf1487e362fe3b 100644 (file)
--- 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 64a083180d58d2636a6abbb4a2b931d5369a1309..7c53dc5986093b896af4c6c2f309d1d60a43d9aa 100644 (file)
--- 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 a5c933d6082f32b504a57aa5dcf7339f72e0c095..fbb7fb30c2818ebf8ed344a1ebdb0be07844f307 100644 (file)
--- 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 94e8f20fb1273acc149d5ead085cdb962bc8937c..3031acb1ef5f6208b61def11ecf4e3f9f9210e8d 100644 (file)
--- 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 335ab1ecc8808acf4c4685bf8cd7d235a43db12e..46bb7b3c83bdd76da48a139cd9639ec6a9f84552 100644 (file)
--- 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 1473274d83e2bf5a7709e3ee5983fadcd884b1c8..38dd4da009f2a6eb589b34869cf3ef79c1f71b6d 100644 (file)
--- 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 3415026ebd4e506819fa4896a0fbe87f660326bd..113f9e59f9826357d93c248b7582790799689600 100644 (file)
--- 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 5fb821816d4035b24ec6a17fb19fffaf3bd0036d..7c4d80b71b0627501c5f68fd9717d8c3f6085451 100644 (file)
--- 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 92c42d06ab9498d4c43d9dbd0f9da1851bac518a..8a501d55afe8fdd974c72e284c7ccd05db6a5be8 100644 (file)
--- 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 98627135d2e5efa54cff91d0e3633aa8b7f7d373..75e2c5bad0f2d5df515678aade15e98eaed19cf1 100644 (file)
--- 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 d0d4ab3c3276ac09ec8fd044c0c91e2d3bfda001..122394098f7be95b27d99ffe34cc1a4374e9a0ff 100644 (file)
--- 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 c1c7346668e1f5830613bd4d9f28119ef8797d45..a0d450f020376627ab3301a8ee7492b917425676 100644 (file)
--- 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 94508d2c3d9bff3b17fcf3c7c7dc3b0b0ca0bd6d..23e807a2cb8a2a2c2891032f1f9ffbbf7224ee38 100644 (file)
--- 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 2694ea7173fd9168746ae8710811a18869acff9d..73ab12c5c928e05bd46f5f456cb45b29f2eb45c7 100644 (file)
--- 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<TcpAcceptor*>(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 1b320e6295e398433e1da43817e5c0fd22d80a0c..553e1cc4eacaa30cce1cf45e001af65dbebe1bc9 100644 (file)
--- 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 8aed5fd403612a545d777ec50c766576d7b8033a..5833cc350a9c806f39bcce682986ccafb9b67ad5 100644 (file)
--- 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 8d211e0c4fe65493f2ebeae0fd76a36b886a4794..aeee04db9888ab5c84f7cb7e29a649373b12f379 100644 (file)
--- 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 d78c46b32593da2d896d4313a7ad7c0d54eb989f..b92e7949af373bef2f83ce8c3fb0d5eb885f3215 100644 (file)
--- 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 fc8b2f3635c7c029f70898408d0fee2af63154fb..40b3dcd7aa60cdddf511bf7993f7b8a5f5b15be8 100644 (file)
--- 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 51ffb5a3fd4618ee2d589f018eaa236548ad5fdd..662879cae536c5b53fda96556eb70ea8018aba9f 100644 (file)
--- 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 51bdf8fd0ccf14c8ffa83684a1d202684a61f369..0144193e3ac8cca3b3d1d462eab45420d1a8a7d4 100644 (file)
--- 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 39fc442169d57d5df9fbc8200a879b39da88b8de..24362422fa7a9794e1c228b0e2abbd27e32104fd 100644 (file)
--- 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 92d9e295e095f187472d8a8a36d3ba5a86fe6a4c..4642c6a62358f24d7aa632d3af5a39b84ce81d42 100644 (file)
--- 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 86fe2e709a9778d2db999fc5c39c10b7968cd7c8..d27fefc1b8263e336136e3eac610e7f02b86f946 100644 (file)
--- 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 4424a7d909fee69c853393745ca5d5bab3185607..bf20c335ce6bd9b5ed1eb10afa250b8dc92aa710 100644 (file)
--- 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 15d738ea3c9e3de73077d654cfa9dee6e3507685..efbc85ccc662902b13c0b81b56f81d092bb024d9 100644 (file)
--- 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 2ac477ea3cd5f35f5652489280528de74acc7396..cfd0766429016cb487a202616666bd29d371d9ba 100644 (file)
--- 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 456f1f8e51f6b2b323701393041dd66337dfce77..47f1f062f4ca40c8e16f32b8c55c1824d0fe539e 100644 (file)
--- 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 fed0d57371f631f503ec0f2c9c9dd8e4ab5edd88..752ca7eea64e04b5a519eafb12ef5dce23c6eb4d 100644 (file)
--- 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 5866f61b5cf98d1cec8ccd6186162f0bc30e9df9..f8b662042962d189a9d95d8fec8b666b1a9eec4f 100644 (file)
--- 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 aaf2df9b493154cd0017ecf7aed9b3e53979160f..5d870c0a78791673689eb0cc3e067740c6aa7181 100644 (file)
--- 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 2435dddd588a572a73660d4e9cab4ad98ac5e493..94f17c3e0beff578deff50520a512619460be15b 100644 (file)
--- 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 9480fcacad64c4ecd6fce1e781aa1fb2d5070cf4..efcb90728823229d67a6130b30206b645aa905b4 100644 (file)
--- 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 53797f2920be0a6cb34264c34d2aa6165d6cedc6..b4e8ec7f287907f69ef6744a146f2464abe51c1a 100644 (file)
--- 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 68ef11970efd8ed7e7a209e3d63142bafbf52083..19431aafb2510529abe765def9532dbf1a8f7536 100644 (file)
--- 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 db83740b45642319a9bcf2dd793a8671bfa71597..00300403901671564516f3202cfe630f33b412d4 100644 (file)
--- 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 574c11230aef9e08f1650db42f38646c82c6db3e..b889759bfbb2e53a01c66f09f4cc2514addf413a 100644 (file)
--- 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 f4638b37f5eca1ddd9c94cffaf54d0e05d4e6547..237b5c100aedd9b4bbd5733b745428b8bfead589 100644 (file)
--- 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 2c49241b9d0dae9f4b10eb761b9f9045346a5bb3..1dab0a7e7eeb2d9659c96744624ba617e3890679 100644 (file)
--- 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 a5cf7957919191bc0c1c1c8aec91c45619515f27..f8549d409503fed93e9fc31be68760b22c6bcc27 100644 (file)
--- 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 61702b87fe9d6e1c1d3c1a25e93c0c52f9b68c17..871613eeba33ccde93df3f37ceef84d2606eb8c9 100644 (file)
--- 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 6ab36900f639b507cad0f34f9e6d3ea12e67f240..fac099ee4d466a539dead411fc19de3c5f7a9cac 100644 (file)
--- 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 227d4f7789651b9cb5cb984fe4d6fda4748f950b..c6a4393786feba8da5210d6da869d325d28de4cb 100644 (file)
--- 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 42f4a4aeb778a271b79dbe527610f391ec3ea2c2..bdc6d40edd867a572add44e180888ba186e7c5b3 100644 (file)
--- 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 6f9c0b1974a49d3aedb82707b1f39fb83da6416e..2eafc12587aa85eb53bbd9d03b916d8f3f7ab0d9 100644 (file)
--- 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 d2d088c33360346e197b38628d60312ca8a67394..6caa4cf5dcac159f8fdea2163276705c7ff1d043 100644 (file)
--- 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 9b01e996b1e816b9ed5ba03fd52df7f121a36ebf..3b9de53ed8406926931801fb08d867ba189479f6 100644 (file)
--- 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: <tag> '-*'   */
         /* 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<ErrorState *>(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 3218000cdcb229794a51bcf38cf0b1ed72a9a4e3..4d4c955082bb418a960866ccf36b45218a8db17b 100644 (file)
--- 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 b29048ecbffc04d6f4b8a83004b2e69bb46c165b..f45712dd33c3f59dd53c3ea7c2dac156ebd8a77a 100644 (file)
--- 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 ed7d1a050a3f6e52f3175d6b73b7e0f31552ea6b..53dc38adff8a53f0ffe876bb1b11098ed1736f1c 100644 (file)
--- 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 b44f9239ede5a580befe5af8afd1ec52f8eea9b0..42b1972a8b4c0a2ff65ed4607e1d3367d959eb09 100644 (file)
--- 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 31703ccdb3a54d7b3492681564444daabbc76a84..d0d9f56cecb2ec9018d0998191795d3196a04dfe 100644 (file)
--- 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 81424390f00b3623d4e45470bdd915309ed673ec..1ae63d6f8d4dbdd09e412b8bfc6585302b89ef1c 100644 (file)
--- 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 3329ca2f71a3f3e70a0eee6fa7c64ad4d1169c75..188371fa6740f4f5ff453efb6aa3bd56497ba7ed 100644 (file)
--- 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 9577a98aae5875d53df6fd011e1f208e41a19ded..1e6b855b657da97ccdd0f829f0c4ef97eaad1373 100644 (file)
--- 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 26aece21a6f86a34ba3be7e138f5ea764a3a80d5..4527a11b2b89cdc63d5b957f7398114ac0ad00ed 100644 (file)
--- 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 39f74c6d51afcd0128829014fa37e894f35fd1bc..008cbf5f6ed7f165a1dfd0489d03d2083a9efe4f 100644 (file)
--- 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 9826d5c5b9fda2d13c498874dd5373de6208afab..0dea17554e3b21b6ad76c2e1fe43f1c46f461ea6 100644 (file)
--- 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 00db7eebae49a19a781fc2511cb74d9aafa54dc7..46477b0c88733647589fab67bddd75fe879a0dc5 100644 (file)
--- 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 22e995aa28d5894519e62568e023ea3b0ccf239f..72d849af6a97ef1ad61c4b4f4d0068c318ae84ba 100644 (file)
--- 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 4bfb7ebdf263781a13e1293e20f4897e3c7eecaf..79a701a2826a42e54be080a1338605336d623f58 100644 (file)
--- 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 af738c4bc4116fd5e5c7c36e9f08c85d28ec7bad..1dc93481e945fb00642887005d0e5cfb3cf84cd5 100644 (file)
--- 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 3c4d1f8f1329e47cc29098e5b9beadbedb456d52..5d157ec968de99f210a0184432dd34e96b63e555 100644 (file)
--- 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 9a42144f4d9b92515705a6baf4b19f8cc87dcdb7..5d16520f31c73501347aface66d760ee29a1fc24 100644 (file)
--- 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 b9a6eea6e819bd3e1955e25dd6e524cb8c096f08..01e6059676013d9aa761f61f948802033f995583 100644 (file)
--- 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 d4c401b00ad445cbf852f052aca1aa858fbbeb16..33cc7f55a11b6cfbc597b3d4416bda18883d9088 100644 (file)
--- 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 eb6ecd17986e5fb619077abc340f0e0894a92e99..c8a37bb7ab4321809ff084414728c9cdf1c7b3e0 100644 (file)
--- 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 b923b79d6ebf95b3aed9c5ab763ceff9bcbdd0eb..773827e4494aa9f2c2c80782741f7eea79cff652 100644 (file)
--- 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 9054f75757d39b2a7cf8436223231dafb34db819..acac12920c4a2109513b8a9381bb54b22edf3df8 100644 (file)
--- 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 315f22f02485058ebc24e9409b2f7d25520d61e1..7101b573e4049ce8234d82e2a1e713a554b05d58 100644 (file)
--- 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 74c61b1df50abfa02d967245aa0a9f6b3fa55d8e..47dcca0dc923fc4f3fcd9cc1ffd72d8029a3593e 100644 (file)
--- 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 2960688e9f9579c8ad928f30e458e71e2d9f7c12..74ffa61d4045c5dd216d2fcc6964ddae23a4c37e 100644 (file)
--- 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 b2cf20ce4660737642850698bb6ce4ff465914cc..89f72f2449df951687816e47f890d0efaaa939d0 100644 (file)
--- 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 87132024e98e44a613758a355abd66eae8736731..bb823ff774182f8d63438d9f76f21d7d2d454362 100644 (file)
--- 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 d268b8c6605ce5a2f8919afc3f713f6dbfbd67a0..739e7c0b3c587324177907942fa780aef3b393eb 100644 (file)
--- 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 508653ae644ac81f6514936684a0507141596136..6417bdb6447a5b0ee9cebc28395887bbdc3504d6 100644 (file)
--- 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 ff21cb370e5d567197eb8ff0c7087c6b9b58b712..703d5fa09c87d956db861bfcdb0c6a491f1e7d7a 100644 (file)
--- 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 9c0d88536718c8a8f0a3228c15a5b25cd05775ea..b1de99795872192c1909cd4186f97134cf1957d4 100644 (file)
--- 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 8d528c3ab74f333d0c2546063ddcd5779613e141..f64e8a69e23ef9a3f343b69872ce2d43563277be 100644 (file)
--- 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 837186160df849e2499feec46bbe7c8bc2dd2558..9aab5bbb7b1ac0d7fedca4dd7c8d2c65dd196a2f 100644 (file)
--- 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 653f48c4cb75ba285bef9eb9f4af1dfa1e619782..d513af7a0ec786dc4e784d66b58eb28a005474a8 100644 (file)
--- 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 393b76386c389cb74c26bf5b34f1e5051af5cb99..1a720a9cc38393b13452d1c98cb5a7e80e07fca4 100644 (file)
--- 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 21b591bc936f6399e55f5073ef9c9bee4138ad3e..0857d19849d10420dcbcf0308173c21ecf7fc1cc 100644 (file)
--- 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 f8e74f97c13e0d3ce3961d07d7f88d8d34da2d76..a344b12f499c2eb6903dc5f570a6d20629d501e5 100644 (file)
--- 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 cf7c061ada3cf3f427831501313ae039d96ad795..2e81d0095a51f876bf85adabdb894e63b85b381b 100644 (file)
--- 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 70a909213366b7de2de60748ff41e8725e413cd0..01bd3bdb70d58f1f6c9fc86decf93aca634813dc 100644 (file)
--- 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<ExternalACLEntry *>(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 d4401084b29cdbd578de820ea6079b8e92395eef..e2d539dec0f45131d610fe8df9f5ce23daf55131 100644 (file)
--- 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 46f0628153c7da71ef4456ccb7f4dc1e111a48a6..292df722c982288be87ac6e515a20a2fd18d2510 100644 (file)
--- 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 133650163534f3b99b7e7602b515a14d68624ab6..29951854ee4e6b113f8779d04503800c1d68de38 100644 (file)
--- 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 8bbc549f7d1fb7e678d4feed9fdcac19e2e3666e..e3f1ba3618307193da2e7da5fc74e8bf2c6c75e9 100644 (file)
--- 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 48cf3a5de958b772dcf4908ea1ccad963a522e9e..dda30ab8cf9993289909cb4cc2a057c7ebfab09b 100644 (file)
--- 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 e269b7df3b802402feb19d886fd530dd8e22b57c..39930bb10839f722371975faaeeea9a592a45447 100644 (file)
--- 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 8c90a530e6db4415c661a1c061c083ba3bac8efe..f4f9b1d2ab5e9540c9f428541f943f95e5377315 100644 (file)
--- 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 5042a279e90c4e154443aad016d114089dd860d5..9a7da3ae1efdade496915bf1789617ca9a018ae0 100644 (file)
--- 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 e1b6a968e4947bfc1d6299079e4c82c473a835a0..5ed3df9eb76fd66ff39cea125a772d59b3ae71c2 100644 (file)
--- 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 a8e0a10fa4352bb4a201942673dc05d90f89ed25..017e0ee09206cc4b1272bb514a795d15810c71b3 100644 (file)
--- 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 08c3ba2fe7f61957c09fff809e9fdd18e7473744..968fb235a4a3bafbdc2a686f18147bf2f22b7992 100644 (file)
--- 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 9f4408addec7a3bf66cafd8d2c5e347452401f87..ecf463ca9a899c58cbb733ca06493f279bab6059 100644 (file)
--- 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 c86c338203da99ab63807960bf476e5b9830a897..d78cd3b24d5975536b7ff35d1ef14f66f41e7bce 100644 (file)
--- 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 73bd35d38d78fd27ab3deb229cfd123b2326ad89..d33800169355e24d0d3dc733b11feba05f6a13f4 100644 (file)
--- 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 ec1cc556a2e1dbe620f028cfdf039707b2cc92eb..739dcd0fe73b747d0777737482f64a2c9b261c9e 100644 (file)
--- 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 9d50af904235d681fd7892a7010abc3022804bde..67d9eed5dda1bc790bf952457334816e574533cc 100644 (file)
--- 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 b525e9cda20d7b5662103c7ca15f8f5272b9d146..1fe7914d79c57d3486ea04f030826e2af18cb720 100644 (file)
--- 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 7ca519e08da8c72bb455d0e7a290ee3de88526d3..7ce93185399a62639db44d69bb7756641f91c502 100644 (file)
--- 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 ba0bccbd9529d8cd4f2f4c8bfac60a3b4f57ceef..59422b755a7634f6f45488a297d854265849dccf 100644 (file)
--- 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 941c065e37e4aeac2a1f65437ea513a78ea9b12a..b5df1133b666bf95788fa9ae130c92342ccb2bab 100644 (file)
--- 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 a6161f34d57d9da4ebc162e6e19cff82da7b3943..9f19d02d9bc9dbae5bdecac947b0a47adb4b4a24 100644 (file)
--- 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 1dc2857bc17183e25f15d5078b1aec417b91e3f0..45b98601da2928dd4db47ab2308b069464c2a2fb 100644 (file)
--- 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 139138f9f2a4019b8bcb0a9a249bdc92df8beb92..dcb51dd17916ff6b62d9250c83d73d428bd774f9 100644 (file)
--- 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 f0b0a6980e76537393d4e5111d24248965f6b49c..9d604611c5ff5c72c6e7bd76424218839000d250 100644 (file)
--- 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 dfc14fab49cea1686fc6d701e0bd7d99b79c9ada..09567dab2d553de8dae115ee3e62d927222fdbb6 100644 (file)
--- 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 65e551fead3c9a28184fbcfa818b06bfdef622db..589429bca6f081dde255d3f49197f7c91eae328f 100644 (file)
--- 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 601d4ded7a77db9f2f9c4cdf4260929a317772b9..13ee89e23ea334253d6b392e45d3237dadf3bf65 100644 (file)
--- 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 3e134ecb0f85c1d5552715d99b9da650ebab71a7..5750d3a9f18cb201207d02b79707172cd2b00c35 100644 (file)
--- 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 0d2744d92a65b05949c594f81639fef3918d2deb..e02342f6a87d3515c532ff761dbc026921cda326 100644 (file)
--- 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 cb1d23c550420dbec8be867f8dafed24b2ed206f..d7aa429bcd161af274e7228997f2e23e0288ae4b 100644 (file)
--- 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 0a3816cb37cc86296857e34ae9b813b4551b6276..c3656413b360d781410beb5e64a81350781c6734 100644 (file)
--- 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 63a219954738a1853634f8e857ed8c92554e3d03..ed2feaba1ec6aa85b21f13f0cc855cf9362bf813 100644 (file)
--- 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 d87c3aa9aceb8ee3e4aea36208d8b2b0399552b7..e84c766a5e0e96e9debb362fba25f09fda3a3f94 100644 (file)
--- 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 c8e641b190bb814733fad5b42844be637425c0ba..c7c72293e1768731d95f9a73c60ccd0314827e29 100644 (file)
--- 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 12d7960d77dcf45ca2976b8aaede4302f9be6c35..b5f2bfed7a5d200ba050f59f07221863a8bc1298 100644 (file)
--- 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 d1da71c2bd9cabb1d867b1e4851d5b622d7ad207..e3b4bd5762e88ed117e275cd2378bf12739ba929 100644 (file)
--- 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 1ce7d9100515675aa8315e9a9e6ef111f06e0900..61492891bf10dbdeeec5f38b9d8e4aac892b7fe5 100644 (file)
--- 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 96fcf95fee943a4ed4bb03eb61940b4296c05c00..ccd5a5c44efcbc83efd417b3a9a8a28610655c29 100644 (file)
--- 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<const cache_key *>(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 d8486346b6f27e0222afe65c37211917d8e238d2..d0acea59a15e0c200744377192174b27ea36a2ad 100644 (file)
--- 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 f55ed2008eea35288066f82758c1b04b1c6c0d6d..716593d0aaa96d22af8890a0bdbb5f24b022aef3 100644 (file)
--- 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 975a8ce9186f700212c0b81cc1e94af40efaa09e..14834f29a8236409e337eb414d21d7143d4eabe8 100644 (file)
--- 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 dd7fe2a0f2965ca52591d1992231fbf50bf68dd7..d9c6f918f0a06483a815a21437c27635930b9e44 100644 (file)
--- 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 fa4e9e551682c5744ce3299df222e24dec1ffe57..43d62dafa947d5510e13a13519d0ec84be863c31 100644 (file)
--- 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 2e0eab4d8e9ed8d7bf4d1865eaf203a9597bd0f8..a121cb0518f7a7d030ecac5ca08df7a4fbb29740 100644 (file)
--- 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 cf17c7db004afecf8bcac2f861ec45bf6684f90b..4af55d79b5214cc570e0570e2ef53aae0a007656 100644 (file)
--- 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 43c1355c681924f10c16d414ed7e6ff35bcc0b29..af4eeca196aea34a28ce09c24db36b8f0e984c66 100644 (file)
--- 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 16dd0f7a06008fa382a63d161d0ae61312ecdf06..130b1f6924c752392707492ecadad385dafc0bb7 100644 (file)
--- 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<Re
 void
 Fs::Ufs::UFSStoreState::writeCompleted(int, size_t len, RefCount<WriteRequest>)
 {
-    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<WriteRequest>)
     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 6bdcb7cbf353a6254039edb02ea8900241af8fd8..eb2458bac26de7660e1b9361e635637d1a494fa2 100644 (file)
--- 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 cf0b47eb63e5fdbf8440e4956f627728acd6a7a9..9253d08c9239eabb303e9fbb6cc4a1a8cb49e06d 100644 (file)
--- 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 56609a587207c3ef5f1ac9086fac2b3daa650a9e..a9332369192c9d4b3a269581acbda4438e491de1 100644 (file)
--- 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 a1857d03e4bba7c66acd0cc3eceb96af5ebfd3ae..3c11962149e5632346683f166a0359d93e91f24b 100644 (file)
--- 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<UFSSwapDir *>(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 059650ed898ea26a4e8a04832ac2c3629606a36e..8575b74c37536170aafeeb2765527a0bfa06af98 100644 (file)
--- 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 db0554ebfab7682be85cae44ea2dc840faf0b056..de866b1f24c250d45266502b4dcc2ed3c766d36e 100644 (file)
--- 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 f0a5fac974cae6c7db0cabd04a58d927e87daff9..785b690761799c9f05dccf9f1916b0fbb8ed443c 100644 (file)
--- 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 b2fe18bae054c70aac10659dce1dda18c5640777..ec0d72c793bdd1f3244fe151f1ced5fa23752f9b 100644 (file)
--- 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 d9ff0e8e8dd872e90ea04afd4a63cd4404ca8d8e..06b81c6701f83a1eea33a8430d7acc2bf230f42f 100644 (file)
--- 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 400c5ab1d770718384c0d24ae90a5850e65a5695..951e3c28061fc169fc05c4e0f26c47a210825504 100644 (file)
--- 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 287e60f73a7e778a2f754c8501c390a7823e7a93..42c1a277f823bc1b9ada7650868d6cc3be56af74 100644 (file)
--- 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 adb8a788484580083f559711148261403d147f64..1c69620f8ae68920e44df1fe75ad508e8139a4f1 100644 (file)
--- 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 5dee76911103ab0288fd6be44c646c14d9f1c800..52c373969780111c3344bb70573e8ff23bfd5e86 100644 (file)
--- 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 68d189c49e056a67b9da1c8ba7b53bbeea8902ca..a3b25a913bb82969405e2f68bf589df2fca4b832 100644 (file)
--- 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 be7c45cca9fe928369508d5c0c0ae3499afdd9fa..8c8e9486498be358ab988c826a0fc6561945f9a1 100644 (file)
--- 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 da2d0c9df94caa7a05aac8a3b241ea04372fa711..56c713886ff97d31fa2f16ec3ffeff1fa4c883f4 100644 (file)
--- 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, "<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"http://%s/%s\">%s</A>\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, "<IMG border=\"0\" SRC=\"%s\"> <A HREF=\"%s\">%s</A>\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<GopherStateData *>(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 1d73bac113abb9e1badbf96ec89cbc46fbc4e37b..f63504bc6f83124539c79e6a84c314cc02055178 100644 (file)
--- 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 f4ab558acc705d1bc7491777b40f713309c08c12..88efa264f585b71b58f969cf4a4406445f69e11e 100644 (file)
--- 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<helper_server *>(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 5e4bf6fedbee9cd1342c6cfbae276b724bd93645..7738dc310ad2905d1858364584074576a795b6f0 100644 (file)
--- 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 3673ee866e5934ce38aab110a1071d6f0e54ea5c..2b9f4bd0309aef66dff9f906c692e47700d6a536 100644 (file)
--- 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 c314dbb401e68734acc2f8c3c322d9d76342745b..a330165b3f720b37e60479cc54872c4516560c4d 100644 (file)
--- 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 97564753886798ee0b4021c71a2ba9aadaf3b30e..b61305b7e69c339f7a2318be9e35f2f2a958787b 100644 (file)
--- 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 1dcb610caa05da2c32550b262e26930c0f2a5679..b877b2d9ac0f3261294c36e85881a8f5ebcdcb25 100644 (file)
--- 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 e953a6cbabf8f4856188aa8034c29af24e9d4430..902051aeaa21e7be6701e6db7532b0e1f405b410 100644 (file)
--- 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 62de480958396869a4cf4104bc51b54f0e451c9e..5e69f6bba484deeb491a6b9fe1bb51b23328fb0b 100644 (file)
--- 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 ab18f167e5babc43d5f713b2d1e6c1b17491fc32..c2fd65c55daecc201c3d61454fcdfcd93cd960bb 100644 (file)
--- 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 2cd6b11bdb8d2a42a676298e75df3024bfc8da8c..4eadf5bd73df837590ea4721d9527695c2c09552 100644 (file)
--- 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 4d732251cee48943a7ff0b60c769b98fdb9b75fa..20cf01366a73a9a922911bea1f221bf6b43ac530 100644 (file)
--- 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 70136953c23b05743717669571da140182038447..c0ff261a0b7274716b4182aa420cec3ca991c3f8 100644 (file)
--- 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 fadea94f8b14990e42a2c4ea660aa4612ac3fdb5..e36f2ae05edb9c47e876d2ef30abd74fb62742c5 100644 (file)
--- 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 b95c7b1e12295b198129a25dbbfca5c1db96c13d..b1dae2ad2cd3bd08c5ee516a465de1f31bdea4cb 100644 (file)
--- 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 d955761164214aa1f0d2b7ead2c5a47957f1af5d..c9d050a52a401d84af7aa8165e07c7f89896b39a 100644 (file)
--- 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 1434cf89d0e59f85fff0aae800bd096f45d0f879..578afd174dc865593e4f28a47aa4702f50cb3aac 100644 (file)
--- 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 5fd8b247322c6ed9beb1bab4c2c41efefe61b072..147056adc031eb36d7f87887f74f047c512473e5 100644 (file)
--- 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<HttpStateData> 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 55b441824a32760f48c74a5ffc5bb7c76a781f3f..e70cd7e037f0836d34d0ea6ad1ff69fc6ab232a0 100644 (file)
--- 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 af2fce82543c6686e0d67dd0dfd68a9493ad6d27..076afa886383f189836c400e60aa97e9b1e662fe 100644 (file)
--- 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 fd005b26d3673357af93f832bcc5b08c5ae38cd8..35b146a912f380d1c33b414205d1c0dd152058f7 100644 (file)
--- 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 c476902c78446db6d2797d8be2382e944d88f2b2..081dbd58c72db3168cb96e22e2cc0a112e2a4c28 100644 (file)
--- 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 ef5f72d0131e9bf388cfd5abf530ad35e7ac5ca2..230a33e743d074886cac8c9e04c17627c1fbad89 100644 (file)
--- 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 7a61b642939678b94f18120944a9f81c9bb6af02..11a9312140420ddb715ca78ad3b349f3834b2924 100644 (file)
--- 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 7842ce156c2503fa71adf75eb7a1e921d534f41a..a8fdbd192117b89ac80185a02fc6f4782cc3f809 100644 (file)
--- 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 4c82a0258aacbac35b206394e8398c07e704e2d8..c6a03256ef406b2c7dd6c1b676d06251d4cc594b 100644 (file)
--- 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 bbd0bc4119356e81ede138db071e1466f5e9624a..94b0afc050b8d248a12b70e2ea5fb724c1c0108b 100644 (file)
--- 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 e37bef99d5741e93204ce8442cffbef7093c69b3..b2a7c8d2d3c71691806620fbae6b97e5c84fcb81 100644 (file)
--- 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 123103479d1ff2c998dea8215bbd35049c55ebfb..a89e9a6d9ca7cec98812ee10b58d12bb5d09adf9 100644 (file)
--- 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 7becf80c16bc281d66d882a915c8674fe80020e3..30b7f6717141882acfe3efe8b4d6e1dfa1359927 100644 (file)
--- 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 e3d41545c7477d23c9c3f1929aba1d208c176830..3a8c88735049c72620fc88bbbe75d7e5ecbd83ef 100644 (file)
--- 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 9169260c8475d512e7112709a6c1a302758579dc..fe4a0bee9847c4ee029c4f0e1a2c619267cfaf58 100644 (file)
--- 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 5905b3e238f0ff17c34a6fd7c0167734d7c39ff5..a30de34b6ea05f1f793d29b4ca47460b0f0c959a 100644 (file)
--- 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 c72c4995e5dae7a432eb7a0c6079eaebca0e36ba..2a9bde601977a0a9dc8c756c8bf47996d093b27b 100644 (file)
--- 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 f33fbfe6637c1c5d37f3962838bc7015c340147d..d9f3620a754c3091bc46d7af35c6f748a274d501 100644 (file)
--- 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 bb2ed4e33daf8b9b1083c9426280814cea5bbb7c..911e4af4795b3dfc3476cc86810839653f5138d3 100644 (file)
--- 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 03817826d818c6b8c2b3eda7602d7163f89c2ecd..d85281b094eb4bbdd1031695f1ff49e9a8878f18 100644 (file)
--- 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 d25416b86d0fb2742ffc161691d72cbbe288a678..a07bdf8e2071d07408bb677a339bce08839aec64 100644 (file)
--- 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 232dad6955c3f9c6d61bbd6a67c8a52543e35c7a..d01c6f66ee286666d88bf5728d10c53a659a3d56 100644 (file)
--- 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 cb7f4c0bf2bb54fd545e1d78ec0fdc6d8780d796..a89090bb7d3e36be6e2f6cb7fe0e71bface5e95d 100644 (file)
--- 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 49ece9a388832cd1601c099674f925f5564d0215..73d853532dc7c9c51ef79a69220d40175c5e7b84 100644 (file)
--- 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 393552448dcf801a1d4bcdaeb9d0c224cabc0f0f..8e62de4ee393f80e610a6db3bbc4692d45dc3826 100644 (file)
--- 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 96fae6864211b27860d7a1bebdbebf7f8ce495ce..7216401eb3f421fff37aa5590efde6999521de11 100644 (file)
--- 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 6c0bd4e4936d9b7121ab21c1acf0382c446fe97b..3d7798ed210027c5686c439c0fd408fb1955324a 100644 (file)
--- 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 80cf6dc9853cd6aa8720b3b1d99a4f290ba889b2..4992d1e9b791e13e57e8133d298279bd90d7b1f0 100644 (file)
--- 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 a73a70022995492053c39bdbbf13fbe7b1207b97..8025d210ca7925da375975723de18ca5ddc74cd8 100644 (file)
--- 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 6642c5b8c31bece0aa12d20286fae049c4c75279..78c8a40eb2d0afaa82b48ccfa70dbd06bd580b19 100644 (file)
--- 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 6d2f8ea9955f4aa4673a11fc1adee80f7790c173..132d4d0b8c38a578e2c63ea26bed5a34921b8784 100644 (file)
--- 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 2ca8988bbfefe126d4c9461c7d10f48c86eca08e..a01b701ac9288dc482ba486aed4f90814d1ab22c 100644 (file)
--- 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 3a6bef3fe9e3fe449703aa8c1814aa01b27bc545..0d54c0beaa9fe82130e6b7f9f10ac8d840acb372 100644 (file)
--- 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 2d40574b9c587be3538e0f8530635ef673a45fe8..75006aa42f518708c1a28370586dd8cfc412159c 100644 (file)
--- 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 2b4ad28d27361473b62a7b39d28229550bb19195..20949bad868cd714d66d282187d02667387ccb8f 100644 (file)
--- 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 fa2b28dd16b69ffd621717625963f384f72e9cf6..8aa2b4b92cb7f874456bb055cab18cdb23c16345 100644 (file)
--- 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 f450f83f262997b2bb8735aa2932952081ac4887..eee28b6e2cd6d692ed9e1ec1a94a1d3506418c5e 100644 (file)
--- 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 433601441fd31d7d1281a7803c846f9ec684e9e8..dfc010b04570713221c9a4159c75c4576df3ed8b 100644 (file)
--- 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 3c2da0720cec3042f0a6b34dac78c0664d65241a..499ddc5dd9a6006fff8ea12a51e732a293221ba6 100755 (executable)
--- 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 735886dbf8f19a0a60367aa75e7823279fa5153f..66c2086582f32185ea767cec60af464f54754589 100644 (file)
--- 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 83f37e088f65cd2f6ed37b7d76e51d7789e025de..4411878e506fc6453e292f41064d0df63a5c1628 100644 (file)
--- 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 96213079d21c7738bb6b90f601f95c44eb715846..944556fb94342a2de67a91dc737839bcdb0296e8 100644 (file)
--- 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 19872bf5c890c22553f3120c89f6f95ec856b31e..62ba618cca8f279efc42748ab15c8e2413c421ea 100755 (executable)
--- 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 5f2372560c3038f6d52cdfe37617f98d65ac1152..a652e430f6a5af3c7e6b3cf4fd462de2ec2ea0ad 100755 (executable)
--- 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 c3476fa5b7739449656e839e555d7dcad639637d..7923c581645df0ee89795be4358d74233d048433 100644 (file)
--- 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 fe0c616ac92c64666caa64646a6113e843e1fd26..ee36bb4bccba9560b0fba1bc18d42fc9f53f09f5 100644 (file)
--- 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 ed187a0ef1823f0f741ea96a9a5933564bd1ecd4..9a9cc3366d7c73ad813ec307164947a8954719b2 100644 (file)
--- 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 a357a56d4a5fc9a36c6765cea2a1fbaaa16b3aa1..d4da2326743bfdf27077db1fb4f4c8291a96777c 100644 (file)
--- 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 ec9c8aba01d46c37a595c2f10f7261af16474eef..458e3b23e0772677d5413ec14e11eb3b955da6d9 100644 (file)
--- 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 25c26122a5b17d8796d5a4e3cfdf5771c7457198..727d3da1c13f7785905722a1c8c0186c97ecd590 100644 (file)
--- 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 a00bf92bd1fd82afd1c0ba4a85e075852f640559..82fb06e99cb28cfc9fb2dbfa2cc48426d8dd08c8 100644 (file)
--- 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 a619abc2c26c22de815f99b159eb456e422be4b9..db1cf429a07ef7ddff15fbd16251316c01423e90 100644 (file)
--- 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 84c6e0f3191468738d5dfbe7e27f2df7cef21157..69aa7b9e7a2b9bf0ac991cc014d50201d6ae6152 100644 (file)
--- 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 5dc30de0606303c839805e6faec1e5462e9321b0..989e756f37afea18d5faad45d25c23109491a498 100644 (file)
--- 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 0650dd2c1a4334a2b58cc752f1f8cac4fddac883..624e7945d44a6e507d11b44abbf75d88283da37e 100644 (file)
--- 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 30ce8e92e00a69381678687d86ffc648bfb76210..c2238813910d53e2adcced70ba0c89c70557469e 100644 (file)
--- 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 0b69e3e47d2ebbccb2ccf9a09b0c154938f1c29d..c28e84ca4c7487576a85022a2b379ed6c66243bd 100644 (file)
--- 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 3b8d979d7966bf43e685cc6a05e1bb5456c83a3e..b38aff12fb754b7604a0fd5a0c65ee386def8702 100644 (file)
--- 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 6512be0382539809f55b38df4a9784042719909e..a6d9769f6c97d57a2a12f9f44bbbb374ba38c6ce 100644 (file)
--- 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 abbf6721a7eafa5f50f68460781e95b1ada1b231..902dc7b97e16d645c0568a8578cefc65bc233835 100644 (file)
--- 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 394bda4b365c676b7b174bc1b0f4dd7bf2d3d4a0..90a007219d9f75125705a52f8858ff130cefb12e 100644 (file)
--- 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 6b95a28e03167c18ae7c00671c953873c12dca6e..83540c78dc9f383cbb18eec5490da860270d5e1e 100644 (file)
--- 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 dc5c343d54c8a79875fbdb7609238ca9680de50c..6d2e8f33e2a2639ba2e7df5b67cc32385c3db9af 100644 (file)
--- 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 7514198000b2414205cdbe0a15c728cf8bd95e29..c8cd2f1373b4e9caf448e41113bfee8309abe07a 100644 (file)
--- 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 4fc0af1c5015b10a6300bba39101e51d4f37ee1a..0705fcfe9ac2626ab3362ea6cbb8feae5ce05662 100644 (file)
--- 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 e45e74c9a962a4fd9e1a0cdd10b3e6abf8e5ab4f..23b694a0c3d7298683f36b2a47ce3ef79c7590b5 100644 (file)
--- 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 a77a0d5fb4ca95dadde7108880f11ad4db1dbde4..fbb019611c9436bc0ce110df419c2076b137ca63 100644 (file)
--- 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 d887b29469b3f938fecad337dd37ac286f813094..5ec7a7fac051094f8f27f57856a780489a13fac4 100644 (file)
--- 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 &params)
 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 ae52d55ace24be380b82d17d0ab14a75bda62d4c..ea20314c6f3aa6d822b7097871691da822da2fac 100644 (file)
--- 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 001ed761fb58debb8b5bb5607c23dca64ed6707c..63364b95fb7b3991486d0ef4f84a61de9c870528 100644 (file)
--- 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 8d51e30829abf38f9732bbd389259cc7b7aba820..a54132ccce1b0d048ee760ea38ee79d2fbac34a7 100644 (file)
--- 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 b1f446e7e59e4d07d37ae0ede643a09a2aeaaf85..f7ac5c02d114abd2b5973584bfb4c52c7dcdf42a 100644 (file)
--- 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 6c9d837e28e891b26e30bfda5f6090d60756ff77..3144b8378037cc545edce467fa6f77ad50f628ee 100644 (file)
--- 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 18eace6161bd5f3ca542fae490b2bce27fd0a005..bee9a394fa9c4815cbbd7fd3525b83f2e4abac6e 100644 (file)
--- 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 7669c41b9751e6f4b74ea1935dd0c5a085395565..215b72e179c230ae5ff49168e0105fde004a7829 100644 (file)
--- 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 a83214f6c7691f7b3070e710a5ccdc5954696367..b0f352d8f3af69e3440b3362a23173c831aa90fa 100644 (file)
--- 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 6611ee179cdee6d0e4829e8e0e6d6f68ced726aa..160978f4af92f5b692b770924fa35b8739718eea 100644 (file)
--- 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 83c9556f2e8ac2cf9210178d6e9486f537d4fe32..807b3642671c9bb04e0aededdef6d6a10f7ccf1d 100644 (file)
--- 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 cc9e15802067d0693c86ad955cda2bda1852c1c5..2b283bd72fdbc59edb46843adbd6e9e4f0583daf 100644 (file)
--- 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 cdc4c17cd97cdab81596bca62863d7f02c51016d..2c8f8e41b7978f0be220239e286a976e5f738d4a 100644 (file)
--- 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 09411922edaf2bdecf80eb7df5011ba3632604f1..bbd5b7a1308eef63600b461118e731b4f730c5d7 100644 (file)
--- 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 cd6db5355aa471ff2b7ec2900d198e5b07bf1bd9..7bc7c03c487a9ba4ef0737d4fea998f3825207f5 100644 (file)
--- 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 925585e769a59604d968da320a8605bc6c089c9e..4e6261c0616319ed53d6e22b1c193695cd4016ba 100644 (file)
--- 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 aaafef1f63bb2476adc54eacc1d61aa61f067658..1044b55872f37621057b1eb780ace5fdf087ffe8 100644 (file)
--- 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 bdc9e26b1718a27b22e130edb165e77602f61c06..cff35b14750e2901f4fda41d793a7d955a2bea07 100644 (file)
--- 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 4ef4ad381ebe87d5d049b6f8c00d07f83b828d07..96f1cf8a3d4639399fa73fd14d14c449d881bf12 100644 (file)
--- 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 d55c7256524d428c50c9ef9bd738969f1f17999c..7bcf43b78964c409e657fe6da66cc5fd4313652b 100644 (file)
--- 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 bf4eb3d3b61415cd8fe0e355d89bbcb06dd5981c..d7f1838fe5de2d016ba9eb41e5bfefeabf6e73fd 100644 (file)
--- 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 57f044b27e0ae903e1f25d2d8901826bc9b5cdd7..8ec2e1c798852fca4343f462f519b0a17589b2dd 100644 (file)
--- 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 2b49932d46881868700ec156ce1fee5c7b7fb6e0..1288b238f638c0b523195cb9b4e46252ce68e3e8 100644 (file)
--- 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 e9792a25084e7ed9529547b4a239e4e215227664..f4cb7546f3b5b480c0bfbada6fd2b875e4051ae5 100644 (file)
--- 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 cae66bfcbc2a9b42d81ec90538f353d22b80fd19..6dea4caa92f92a98099e68c4a13dd1df539541a8 100644 (file)
--- 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<Forwarder> 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<Forwarder*>(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 ab1d056388fd143d9233163cd481ff9978fc90c6..9d1c087c654a4b348e0499dd28478391d66bef1d 100644 (file)
--- 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 e5502efccb20a999c502b2cf89e8f42fe08f6888..a2b5a21d795b666213a985aa83af672c9cd98556 100644 (file)
--- 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<Inquirer*>(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 fa4917b57fb65647c9f5ac59ac9fe560b2103e52..8d279007e712a0a48585153e85a03e2948cb2822 100644 (file)
--- 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 db64ce380bfd8b47152fd238d356f3d3737401af..8c3c7215c08ddc69ffd2fab722f63e3556439659 100644 (file)
--- 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 19b8156083f4662fa9a9bdee6be8e796ab825b64..01295f44c026bcd153f3853d7496cbff576bd397 100644 (file)
--- 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 725bead57cb41fa583b33bf25d17ac19b9d8a009..6ec7d2dca86cf8e50a24bc7ea9890f4af9ce265d 100644 (file)
--- 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 7468d6c5598c788442dc6186fb58a75bc4f74a08..8b28710789820fbbe174e52935907539b5900efd 100644 (file)
--- 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 9646878f0740bf7d064c1f3a08423aae7ebec72c..d331b039286c87e2c241add63bbf976bbf7da0ac 100644 (file)
--- 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 170746cccbc8629703d7370c98b0537c8843603c..1ac45461db1c3c365a61e5b0c0cd40731ec639fa 100644 (file)
--- 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 de9de7f818170eecb97c52f84d5df9c139431b10..70d161e50bb6f22049da4a93931e3ec213a19139 100644 (file)
--- 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 3a04e02ddf99b67e96137d550128807d052cbae5..f341b3dd374c4d6ad340c7608bb7e7b19f3d9a1f 100644 (file)
--- 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 6125ae3dc61d68ff1ae9e3afd74efa839434f9c8..05650d2fb92135353962ee2f0f1afc0f6bd87cd8 100644 (file)
--- 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<Port, CommIoCbParams> 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 1124a7ce8ee9bd588c3f4629307d0f8fa3a260cd..87c233ed30738182cba7fb3deb12c57a5bfcbf8e 100644 (file)
--- 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 10507dea9fd20efecbd7a3c0fcc85c437f472d64..1476ee9cb1314355264a3b137e3f954a0ebe6035 100644 (file)
--- 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 b9c74b92a4c491f4439a29f25e2694dc46d87aa3..7138548470cb76f06f47bd6f210f29d4b59ed90f 100644 (file)
--- 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 1fffc29908ff66b38cf022cc1f41ad35d4df7509..f55ca0cb6b20a4f38de226b90664ece1a5f94961 100644 (file)
--- 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 f78577bdf021582cda9b32517fb7fc4dce831ab6..379512427f18f862a293d35f1fb784e77bacc5e3 100644 (file)
--- 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 041d4f5deaf90aecd8239fa15a65e212ae3b5a8b..9ed90bd415ccf796ed2cf6926b07293d6c670924 100644 (file)
--- 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 b79eb682c36ff28d95311a40c560a90564d24c51..01c57eba181618b66ff9cd33668592a1f204ff23 100644 (file)
--- 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 d48b79e20bef7d3617f7d89e420b03490c0b8eae..1fb1dc1ffd659997b30d173cffd6f1ca8ddc411f 100644 (file)
--- 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 0efceff09683cd0af88afbb9f4d13a0eb3f4b6a8..76f3ae2abfc5f4b22f604c21d51d521877bd7e47 100644 (file)
--- 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 b93f3468b3704cf01ae2b0f3d4ced6a1d4c2519b..1b45eaa6c6530dae84c3a924350a8bedc0e5b715 100644 (file)
--- 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 bf128bb9f1eccd3f6fe30f31b97c8c28044112a6..6c3db74700469cc79b0e285b135b09ff392c40d6 100644 (file)
--- 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 69fe8df7ca00b9d3af0075a414f6a8d8fb065add..7943a8ef64dd4d7d5a28497c5767102e3367a408 100644 (file)
--- 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 5c374ab3d2f00d23b93b62eba1c8abf568b50c93..f9b42ef5e72a127375738d1c7cdefe559ce92099 100644 (file)
--- 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 f760f8095da6bc1f0c748d04ea08af29f6ce1f05..6e96e8d34a0a69cf62a7cdd1e9a46894ab60ff2f 100644 (file)
--- 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 2af537ab9218ad05be69687f9f6c831bd8b6b194..b1a035dfd87b478b6419ff385811a954c1667284 100644 (file)
--- 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 509ea90cabc043d452995f8a28a7e844644a6b67..cf64b732532b43ee42d324a96279faa1c8536165 100644 (file)
--- 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 9c7d787f17744c6af629629fd38ed73ad4272449..aab64b1d6c74a59ced10dbfe9683e399f3245488 100644 (file)
--- 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 1339969c52e14a2d39de3b28c92e2107b9eaaec3..b588883eb8206040a91336077d7cc0d285dcd8b1 100644 (file)
--- 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 daf4e4a4a53d211956dd16f3bccd7c2e6602cb3c..41413f15033840e55398f493a4194d1ef5121a5d 100644 (file)
--- 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 c023351b75846a7255c1082234056bd2e538982a..34f2730a79e1b6b54cea92934c23a51fcf92fca3 100644 (file)
--- 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 133a711314f51cbb3a30324a714b73caec782911..4967fca0010363650970079acbaf7695d675a8ae 100644 (file)
--- 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 3b554322f7cc5b002f93757da04bc55e3c8313e6..cd3453037a7d3db11303b5abf6da44289428ea02 100644 (file)
--- 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 383e56d478223e48316a7240c461d404081be25f..bb2ea96794f3e3e65a68b475c724b30c7e85d970 100644 (file)
--- 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 dca3a6885c1756c3584608d9082cc4152379cd6f..706ff078385b8423d360799593a19c8fb541e99d 100644 (file)
--- 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 46bb5e6bea698623c0351d3d0da4dbd02d22b77b..cfb009294489b99231f15a1282eed634c244ffea 100644 (file)
--- 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 9a60cd415ae99925e7a20ee36d63578b961ba16a..1055e02d46a37501c367e9da711c472dfaa361de 100644 (file)
--- 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 df8e82eb97848760f0ed489a7439ace82fe38a10..f02e0777df6a789eef07f8e0d0b5ee16677df9e1 100644 (file)
--- 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<UdsSender, CommIoCbParams> 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 3e5ef1148430121c51caeb4f8022c70856dd7958..9ace9bc6e4be26d674feec9a67c342a9bfef4570 100644 (file)
--- 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 76795c671291c3dd8906b0757d9552231b0a67e0..e3f1719d21dd3dd7ec806f54cdb843ca13f7ed6c 100644 (file)
--- 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 9036f294f72fd5fd35370c553324d9ce4a8cd78a..332972df2011bcda1247773fc53d404728ea40b9 100644 (file)
--- 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 8ef81a432e3db0e1d800aa33d0887e703b7f73fa..02ae46d17304dea1b5fe856307c59fa77c582323 100644 (file)
--- 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 19804df440f77c88d7e738147b28cc127d4463ae..966f8ffeef0b225dfba6fb36e47187fec7d4fc3e 100644 (file)
--- 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 3750a3a02974e87558166b364aaa2c07fdfc66e7..a6237991c21c7c44370d7bce5bfdd525337eacfa 100644 (file)
--- 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 3a9d4aa8ca952f85e21c29585428ba36671363df..b808654465e71bf5fecc294fb8865967fe2d24bf 100644 (file)
--- 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 a4d79886001e04a70ed6ec47afcaf20d8c67344a..3dbc2e68197489bf98dfb617b5fcbe0c9e7496cc 100644 (file)
--- 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 51568bcb42c334f31f0786416e109a9e78474d58..e5cce37a0d72ff69c9fcefac6c0123bb67994c38 100644 (file)
--- 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 23dd8c5db746cfb3fc725038ec307f796bb26e93..571e530e5512fb9368cd87ec6a51fb60fef22e99 100644 (file)
--- 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 ec74c4f69e3c48349aa7c9876a1c1d9c903cfd3a..8b011d68394ed6a1100971bb0fa40ee268de8b18 100644 (file)
--- 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 06bc36826ade553e40f5c269438fc5d2dcc88821..5a24790571a4117cb919a53cca49ac8861485cdd 100644 (file)
--- 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 d17124dd9a2d9dd928a6646779ecf6ecbc345d15..fc2491e7827008f255dfb1a447523bfc739ad9ba 100644 (file)
--- 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<char *>(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 efe9cccbbbf20e50b13dbbf51f7e580087f6ac1a..3befd7c93996d06bc255ac860e72323cd541303a 100644 (file)
--- 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 a28fb1316bfa019a8ec60a74ba7444dd02cce109..1b37dcc1e6c33b75191404a36eb7f22c6e76b240 100644 (file)
--- 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 f1d7a3bbd7489db7522ed9b41c1af4b0c013f78f..5b7cea09ac4aefeb2fb5085fb38a37fc8479caf6 100644 (file)
--- 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 d839cc847285735ba83bf0a01a56b71435daff86..ceda458a180096110478a5cc848726ae90462492 100644 (file)
--- 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 9974b137550809e303218f3ce7ea6d15c609c65a..7b18e8fdcbffc4ffdbd26089ccdfb1b8ca7db67a 100644 (file)
--- 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 f24c8b44729a45f90f69d5ab4cb31bf4eb903a12..8e73f57ca1df7371110d67d0ba26bd45a8aeeb29 100644 (file)
--- 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 87a055488a03f1f1c499a2203eeb9a5d90a9552f..f4f75f45fd60ed4936ee38eb915d8f1ba086c86a 100644 (file)
--- 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 62a46225f45aca802165d7288baab7b1dda53321..f168685b5530eb426950d5e974a90160a14fe96c 100644 (file)
--- 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 9ea85dcbe6f3ae1f3c7ee91e8f7b0039b6f48714..d6d8526d8a0c713837855aac9e6ec6a7972544f2 100644 (file)
--- 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 30203bf08efed6951d6fe2139b51c5f3bed9c932..9ef415da112b74c764f1ec206e6a273e088dc1c6 100644 (file)
--- 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 0d4ab311e818513e4241ce22d675c9752905a081..79a18f5d1a61d7f131d8df76541efbe1ed575ed0 100644 (file)
--- 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 ef5d34c2939bb74705a1c975cb57788623ba1a12..e381d922cedd0f4cb2ab1f6ec00f0e16493f6687 100755 (executable)
--- a/src/log/DB/log_db_daemon.pl.in
+++ b/src/log/DB/log_db_daemon.pl.in
@@ -288,7 +288,7 @@ I<Amos Jeffries <amosjeffries@squid-cache.org>>
 
 =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 aa38b41834b24cac26c64afcdce8441279e87da4..764209565b888f4617ba72ffd6c2981d26513d60 100755 (executable)
--- 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 200acf2910c9f28fc095fdf12e6b96f01ec92244..88049f340a36d0753e5c29c5ee8f8158444397c4 100644 (file)
--- 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 97c84ea10539d4c9a31e11b8ede93667009c4808..4d5407121abb7eccec6c9e415acacb369bfc7fcd 100644 (file)
--- 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 70ea336540fdc8cc173ac59ac37ed6c97ef57661..6bbc573119c7d6f5e97ba0acd6f239b73cd0a6bd 100644 (file)
--- 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 9e933a032abb757a477ab4d942a5000875debd35..97e01942e785120adb5107c75bfc0f70639e8088 100644 (file)
--- 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 15b82d0069e73f4700d08afbe79405f4650e2ea3..b7f0e23cb37cde1481bd7e417b3d7c9fdb81982a 100644 (file)
--- 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 0ebb5eee4a111ce3b0b64ec5330ca5de8492c878..4d236b6fcea2b775b2dbf8d5d7c80107fbc48a41 100644 (file)
--- 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 23076b2eff886f40dcb01a97d3c716a0860c64f9..9845e02df7bccb16914672c52b5e016d75bc7692 100644 (file)
--- 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 6c3e068b03f552f91a4a7baa4d17109379524a25..c42ca21b478b756e8f7beaac3d465ecd9398ff5e 100644 (file)
--- 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 9767376d8d201036e3222979f7842341e40b4094..55acf3ac95aa8495c226cc16525524b61ba5b385 100644 (file)
--- 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 4da39d0559a1aae0286183508f61e9b6e3576cac..070a809f4390f83d14eb76a23cccbbc707707e25 100644 (file)
--- 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 da680e780203d81555226a1e715b6141e2e6a652..7b795bbd6c478a297db22255cd6f1036d1c44c07 100644 (file)
--- 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 88920d2fb57283506dd8da9fa09fe5710579ba83..eabb892dc0cf9e828d6f028bb3212ea279795360 100644 (file)
--- 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 20604ff3bf4faa7ae99a7bcf20c80233726c290d..2790d77037f1eb33bef5d629db125d56992a729f 100644 (file)
--- 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 4c04bb132df19833a66ec296fc00593ab3122d76..439f23df3f1d3d5234f339630b7a97bc2f8851d6 100644 (file)
--- 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 6ac3e0d40b70d660036087a85e6407185e7ca6cc..d0cd9357792f8849c9b71c76576a7a10f2259eb1 100644 (file)
--- 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 fc95307ec6ed9462966838fcf559edaedd60482b..cd4e84a3db8f0a354b3b507049dcdfb656d90d03 100644 (file)
--- 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 d4a103333a50a4f3e50fd7b230182716a9c8165a..09f914d7576eac101b70c2b8433ca8f0bf9ab67c 100644 (file)
--- 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 174f9375d3196ce1576dcfe0cc59753bfa81fe3c..0c7ef8f25c86eda48b0c80cde1a7d7ec5b707197 100644 (file)
--- 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 7ff7cc546b22690f3d07ebc07d420c256c149797..8cd4b3082d9f1cd2d93cc2ebcbc73f32ebfd9580 100644 (file)
--- 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 2f54982e8c842d79dae555589086ca59aad6e174..4d7d175d1a42bc0e97bf19cff4bc74c1555cce24 100644 (file)
--- 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 e4d6f99964aa59ea75ee1c01d437798167c336b5..3d4af779dc01159ebc344faa6cde5fd077ed2108 100644 (file)
--- 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 1dff2f2fa195886f33a1ebafeebdbf8955983163..f95f2e949bc8c003ba5b73c4c6091e060a1adbc5 100644 (file)
--- 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 c918302cff0dff3f5caf430b84b40dcadce6eace..ec7ca5f7b19908583ed9f31e3308e90a2ada5fcb 100644 (file)
--- 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 2dca36b8eaa15fd0ccc14386b9d8fd1b4f7f4100..db383f19e6abb572d7062296eb2b802b96ce7a63 100644 (file)
--- 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 a66ee55ba9d229d2fe88306328cbf520ebb3ff02..8bfe9a80ba06ee4c03d99074100de285c7aaaf2c 100644 (file)
--- 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 56eea0b49c8d83b8f0f438a3a8653505be0b6f1d..01a955bbbafe9357b8cc46f1d44cebfdb7b31f7e 100644 (file)
--- 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 a428bc983e7dbce9be6c6e525e64f56d743b909a..121f3368c15fc799ed15d1be28284648118e71ed 100644 (file)
--- 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 31f5b079ccd48842f10189fa69a348b96040a96c..e06996df4adeb38f129df9195356bdb8f9b3d9bc 100755 (executable)
--- 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 b45e0204c8d4dc8b42e39bc67c22c75240732367..f0ec3667471b45359ef2bda4546d0e5fd8cf629b 100644 (file)
--- 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 4436792f4dba8ff5a16c4e2041ba1007f6e3a0f1..bbae0b8ba8c9502bef7864e306bcae08df1384cd 100644 (file)
--- 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 3ceb42942e80381b0fe55db4f575cf68ef729423..00b641802d659d1aa7b2dcd1fef24f396877800c 100644 (file)
--- 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 fd995d543e0b5fc91060bc13734db9eac16ee0c1..989d37507c62aabd29bc115fad0375579c82ff49 100644 (file)
--- 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 7e91ec4ad71c1af300fc7487dac9d5b7257fbb35..0ef60cf8ca76455c0131eae79bb9d60c479b11ea 100644 (file)
--- 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 bf30e91566113963d131bff3b25102cb586b4fb3..971555e03a5b5cf13829a0438854702b3539b6ce 100644 (file)
--- 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 bf01cd000e89d9dce5b046f30585ba068c4d2de5..3c07cad40826aab99723c43a94aac018950ca3c3 100644 (file)
--- 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 5213432b0d33285ba14227d8d450c081b39054a6..4520620424b0b9e455bc8e497175b96e9e59ce72 100644 (file)
--- 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 6ec649c538897729b8fe20c61544edb17996e6a5..323dd2bf8ede96e17e841967954b3938d63f577e 100644 (file)
--- 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 2879e3cbdc68f796b69540dc6299ce2faa6c4860..a02f5b36d237244a730ead7ba5cdcce12c4b4460 100644 (file)
--- 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 8e5bc85e2ba7e9f91f888a7a7b3e158a6b52fe92..87cc14fe6e71b42fa0840e5049ba451b37515912 100644 (file)
--- 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 4719c6c4535f27c266e6d0adf068d4f897891df9..6b245b48be1941b517f47a9a227ce0355a300374 100644 (file)
--- 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 14a5b7dd393a6620acb9e8b9d7e3ec6a522a95be..b2be9f433210d2cfc6cb7589427068bff6df58dd 100644 (file)
--- 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 4c1df65d867ea1636e32381371a5b62168479527..5a08b006b9ecd2f9b825d6573533d8053fa1dfb0 100644 (file)
--- 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 69726c61da094f560912a0b70f2e1fdd102299cf..ffef9772e42640d74874c44988bcba5bc9195015 100644 (file)
--- 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 b0047433564bf085d660343b01e37f72ca06995b..8a372a6dc960202ab355c5c4c5a4b2f2fdf38e74 100644 (file)
--- 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 f56c03de97677eed39195b88c7adf0d6229d2a25..c16e5fd0f5c623e6696d2d832fe87d471b5137a2 100644 (file)
--- 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 1d0b03289d7fba7b8e060145ac2b98849fd5e5c0..950cb2897f04ca5ba3ee7d0307a8dc3d4f19a6a9 100644 (file)
--- 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 5765b5a8cb26996ac700004cf80671061a272048..e46923d225fdcbe3a796a4fd040b8c41ae250ef8 100644 (file)
--- 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 129e9c4ebc9b59e70e8419c7891fb2af52b75f7c..c875c22bfed3a8cb35c25791c30030439a185341 100644 (file)
--- 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 eecc90b0763301654282d62ddcd01c39187a401d..f66ddf42ec75225124122ac7cf94b0e661d988fe 100644 (file)
--- 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 51416160a1c53af1051a1a76203411ab42e95be5..dbcfbca01f72cda527f7c9a434bc1c031de8abb0 100644 (file)
--- 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 8444ec3050954186310ddb05e45be56374b91fd5..13f8592e68c5f8a8a6c3d5d627c5b60630cd7557 100644 (file)
--- 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 1fe0b1569dec9afab16ae447a4b7f3eada1a01be..fad4194c41ee4c0f4d0e623a2509a88417373b33 100644 (file)
--- 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 32e74b9cf9371bbe97b779e3401d1d6ea8e0d078..c544dd3386337b35ff942c4750858bc2721b7910 100644 (file)
--- 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 da9b38a62c950abbf49c4f40f8409f684def5280..460e0041661fe0a2753484345957640a866e5383 100644 (file)
--- 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 9218489e0c2190f83601601842cedd071e028d56..895cc09033188a2c693c71351a0dce35a2666279 100644 (file)
--- 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 a1a3e9bbdc6e1517259531bfb00e643ac44afdb6..a9e179bb0df83583b7055ac087735cdbc5cc5847 100644 (file)
--- 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 4fb434284e350a19297446c04db72f090e22d044..56dc58e8b36a1e3d9337bf4e104ad1dc5544ec74 100644 (file)
--- 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 7175629a7ad15032c9f9ca5a4cd5b195185e8192..a5d7256b56de53173659b73984f790916217c874 100644 (file)
--- 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 3c6fec2035cfbcdb23f00a9a51ae46bb843b71e7..a9b45f4ee631247dbef30b15fdf8261f91516fbd 100644 (file)
--- 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 b1d0d00653fb6d2f4287e4b4a2f29a4639692112..cfc44becba91220986b3c1b105d1cb82e15e4d32 100644 (file)
--- 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 a58804dace1955478bf6333dfb269cc311f7b74e..52395e6daa6283c10ef51d8c2d12f334e0ac6502 100644 (file)
--- 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 b5ffed3c5351ccdfc51262d306fef62cc971b8c8..b15dc724b71bf6d22ff8e49bb8251c8f5a0a7ae3 100644 (file)
--- 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<const CountersAction&>(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 b2e7bd0c5f38225835aea016a2cc34a29e6abcbd..f7142623699508236b847286e2537af7ee73b6a7 100644 (file)
--- 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 eff191230b57eca1a4b39b3e36da453eb519f552..a03031db0467e1b6fef2acb917c87fbf624ca1b6 100644 (file)
--- 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 ff5b2d22351cc71f1e34c708299840ea958db0d4..d40c6f24e3bae1d3985393ec66a15ff99190b0aa 100644 (file)
--- 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 f48069c1468c614ecf1343dd0bb673531e28c176..7bd86d735bf48cc748635ef1148bc12c238a6d25 100644 (file)
--- 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 7e9d837a2b6a397d98dc4e1c9d7d549f8b10bb72..9fceafb62293fc3148efa0f9992fb1215c44da32 100644 (file)
--- 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 31a02ea702015b27e43f0781ed16bc6350db8d90..7c6aa9a126e9b226a9eaee50b1915aac9ece2a70 100644 (file)
--- 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 5bac5f934027819cf3bdf691c8717f6e7eaeb36e..d2ea07edd02ba35bb854e4ec4ae7831958678e61 100644 (file)
--- 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 1b54c82db08550537b896ca3c92fd98cbddfc0c5..49bbc2558fd12cb3177833ef0ba118f6e26a2644 100644 (file)
--- 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<const InfoAction&>(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 036fcb16d89ac2f23c6efe24a7439beb13c8309a..a1fb42fd05aeeb1044cc0ee697f6659dc0244806 100644 (file)
--- 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 8bfa118b3a385a17d388c970c919dcdaa75b9379..9c44df087db0c16454a24921e5854b050e1b72ce 100644 (file)
--- 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<Inquirer, CommCloseCbParams>(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 85e4a58822f6cf7849394df63bda8b734d73c384..e98fbeb4e2e41ab9380e9810814cf4c8cfe771aa 100644 (file)
--- 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 a33370312661d434a7b18d47e3b7bbe1193b4da2..04a6c321497094c01b3747aef10f102b71af0f53 100644 (file)
--- 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 7b2a2cf6b3fd2ae5551fb901f4931c848e140ed4..5d6d30e654462ee91cb843b636140054d7440243 100644 (file)
--- 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 e66351d46640bf8aac2018a36523f9aad854fcca..2a29be1b2c1ffa9879241748579e2a9df39a68b3 100644 (file)
--- 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<const IntervalAction&>(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 d5a249d02140491e55fafac2360d70a9021bb31f..d6c49008a25d728f8317964fabecfcc621c95877 100644 (file)
--- 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 149f2c4e3137fcc31c31b8a4e400dfce8478316e..8000799a9a4745666f9d9f2f42e50c4f6c540caa 100644 (file)
--- 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<const IoAction&>(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 32de0894e58801879e7bc30e24bae6570ff6dbd7..7e9ad1a7a6577f76b00a12ada8d1f2bcb2e742f2 100644 (file)
--- 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 16744b0226cefa92e3ca517dda445d5fd39be7a0..0f5df3ac67da44981c8298236fce09b4333b205d 100644 (file)
--- 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 09a15c794a7b52906a8d7a2f7837be73b7e77195..e00396ddd99d5c9486ff191f3650e179c3fdb1d3 100644 (file)
--- 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 6ff049c68a4f13b73f58d2e169c177bbee15c99a..a1e8f9ebc81cba992cb683f8dd0bd32f146cf3af 100644 (file)
--- 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 d75580fb7af2e166e4a1e72cc711dbb1c21eb588..dd37eb37fde305a0b8ede65559aea32e343f2890 100644 (file)
--- 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 9e1ba551617946a491c82aae7fdf7b7eacb7b477..924bb346f0337476955d8e8d544a018e219ae969 100644 (file)
--- 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 5c781199e701f2c3e5738cb9c54b417ce22a90dd..1f4faf15a933ba5a31e9292e3d7e1cd81fd8aa33 100644 (file)
--- 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 3daf426a3c7493f19c5943aa3d9a709e571292a6..b10be048191877ac4c590fb43e8a1387894166a9 100644 (file)
--- 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 b60e90f5f93ba398eaeff9c8d0f6e7fe32579066..59b2dd7954ef2dc69e7a72422a1129dca6c35dbb 100644 (file)
--- 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 d4db63eda4722e22a5835f8c670c5709aef7ec71..545fcb2cc4682faa9225ccc77bc41202ab4b045c 100644 (file)
--- 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 c7412ae66e82b27bc0bf751e1224adf20f5e42d7..38461f8b322a9f859c7a564c1b052506bf9d6478 100644 (file)
--- 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 13a0f09cc45ff8d270815ad2dd4653241341e07b..dcc72917a5b70dd88f2071a5ddd6a5044caef62e 100644 (file)
--- 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<const ServiceTimesAction&>(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 6a11d95aa4c80f17868c5fb816a6947112097dae..75e82c32d470a8d2590286427b15c62c162568c4 100644 (file)
--- 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 03cf56384e71b7a8f6bb70c4e493ff5114a433aa..42b8b4d9f5f1a1f57f44d1e992d805a8d3f28515 100644 (file)
--- 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<const StoreIoAction&>(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 956b7935548cf76244b42b769488ef13d31fc5f4..8087bcc6ec0a1ddcf93e2f74704c54ac0278d176 100644 (file)
--- 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 f2cc23dc82bb263f256b0ae473449e0cac6f854d..74d95ea9075d446d4d030c838ddd922763bf21b3 100644 (file)
--- 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<StoreToCommWriter, CommCloseCbParams>(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 d37a18c2e678ba8f0f9af018bd9148fb89ca5f84..8fd9b5d94aed8e1a32df15f5ea8951ed1bda6305 100644 (file)
--- 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 f5cbf77c365ebef22820f49d8f9c7259178ff544..a6fe978dd529a009b4de4f7d99e2b3ef5b3645a3 100644 (file)
--- 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 6f0157b6742acd3ead8a0943fe4ccf131f161a8b..e69d4bb12c6c9c8154955aa3f963a3042e3a5583 100644 (file)
--- 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 726ee4994bb0bc897c406b2ba4d593b4bf9dfdfe..d9ad57abeeaffc7492b59f98456598860c353cef 100644 (file)
--- 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 d145f3e56f873a8859f3536ff1b51ee1e4d41466..edf94b975c2896d1734c0b9b40b13435ca15075a 100644 (file)
--- 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 e1fc5093066fa3666f99d1dc7be0e3dff89d08bd..66186f1f06deeebbf388501417ff614e0180a332 100644 (file)
--- 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 49e8d1eaefd7da382b62d5ca91a256f8fddfdbdb..251348c82fc4bbbe4d6fa7f5ba1fbb783ed1a179 100644 (file)
--- 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 85e69abdfa475e04b52600def4e7033193835bb7..cb198a42d04e3760e9c50935fb0002cb9af8285c 100644 (file)
--- 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 c7aaee55ead970a58b5ac32475bbb32ba8713b76..36084fab2152eb3bc5452e7b1f0f4c8c68050aa7 100644 (file)
--- 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 3f457bd7f72751f242c7ce23f47f3a7d9681cf64..c954703d5c2b1c127a59f1250cbb48d85d50226b 100644 (file)
--- 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 880e3a74b775cae9e836ed94099c6067e0bf6efc..b38cf043bb8eaf78bf3f89e369ce812dd3cf1e9e 100644 (file)
--- 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 8e0d370f445a371c68d08a0043f32cfa54bdd101..6046b1be01b93f2c664b238227c7555779419908 100644 (file)
--- 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 5f8709cac7713f371654f5b990cd7eb056a3c641..85bb736a679c09a7cf9f3481b89a5497d0058e0d 100644 (file)
--- 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 8a741096262335f6daf06b3ac54207c2e6818cc4..cd0875cff008ba9ec38a729abe25660c0292d36c 100644 (file)
--- 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 5235672515fc7dc3de67d3c00e61188f25230bf2..0cb792404b0e764c8aeb157b6b7a943af00cdc90 100644 (file)
--- 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 115ded5eb7794991096b45c8c9811acfa934b751..66bd1b72b81b2cf711143d8582ba8a7ac711965f 100644 (file)
--- 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 850075521dabc49be9e1cad75c9fa540be78e7da..74fdf20ef3ac6a78ac5567925576cebc97be2d2b 100644 (file)
--- 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 7a1862a258dc401a06bdca035270807046eefc1a..bcccdd5e0ab7c017734ff65856b967b8c09b416a 100644 (file)
--- 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 a173c2c06ddfde4ac69fe384c2a835025a53838e..a8a940778334ecf2c56c19af4df419cccb07fbae 100644 (file)
--- 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 03a83881b5ee67a2167fd035405551573ca7c7c3..268074f02d7f33d4e7888d9593d39dc555ece7b2 100644 (file)
--- 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 9e7beeb51bc482bedda7f33c911c80f54fb1794f..da33c4dd86f4a4887b8788c3bee3c4e590301e59 100644 (file)
--- 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 397a6b8b6b825e40a35d42f5e0f93d852b95b914..143b1e8191267326ab65a7005c841c27c14ee8d1 100644 (file)
--- 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<IdleConnList *>(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 5f5b6fb4ee58f9e8cbc35384c63a8d6bbd532656..85e44e50bf97a0d934e1b47f769925fb8cb3e771 100644 (file)
--- 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 7b71528fc345b286d9137a3123c4d5358443437e..fcc70a5cab01167ab8232654a67cec5f5c311b0f 100644 (file)
--- 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 d1251858aaa861363be3e99cdeb3ebf76b3707ea..8544771ef3706d261371498dbe83fe2c407ef70a 100644 (file)
--- 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 aae5e678fb3b553c661c6fd5ed328e3407ad052b..2e1546a53076c4ebc066ef521c8d1f71f87dddbb 100644 (file)
--- 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 68fde240066481b5ac0978ba94086e818b80d3fa..017b4cbcc31497152bc6b36c7bf6e4b918154f03 100644 (file)
--- 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 6713a99e00d722de5d356dbb1b6fb8b7d0f4b6fe..7e2ed5e923ab1275432dccedc88d87007ba243dd 100644 (file)
--- 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 d392f295bf43603d602f96e2aaa0cd91903f0176..e8a482e0b7f8617a2704f28b47836c2f7500152e 100644 (file)
--- 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 ade4cb8a293fe0fee343c5ad29a844cddc2c7a37..2da98244533839e56dac84c4d0cad2430a974f64 100644 (file)
--- 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 f68d34d6eccbc899523bbd8b5cfa04b553540305..cc2f4dccc5b0dca637f7b93e1eab07de265b0aad 100644 (file)
--- 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 73ec8318a0986cc2d9ad00767af6bd31caa896c1..f0d237e7cf7ec1408119d7dc6b7e7559936aa462 100644 (file)
--- 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 9c52f7a2f3f9efc47364cdee83d8dd275e6e72c4..50a7d22d2eccebe832fd9c6103c0c782d922e8ac 100644 (file)
--- 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 cf721699ee37fb5ef102c3b40e244f45ae5e2371..ee34644e9d4f171470231840ca81a54e5fd84c1c 100644 (file)
--- 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 a6094692beea31ca2fceafa2694ef643809f706a..0d2d9549810b17e098218468e16a62899c369691 100644 (file)
--- 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 7f8cc97a61ad9869d4b5564e1885f22380a35e15..024d1a98f6267dc4777f0f6e72f06d5239032d6e 100644 (file)
--- 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 cf1e0cfe4658e14bee5377c19be62cd22618b3a0..119ca53447681bc431ac67842080df314f26b6dc 100644 (file)
--- 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 2f358a7d60be971cf4cfd6b504e7b2298b7e1d11..04513cfbdcf3aa14dc5589c5d7cb1c7b37f4d949 100644 (file)
--- 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 eb202d04cb3ee6a43a0b40ee74e009838636f581..0ed0fdc618f2a5aff870f3d4753a38b374680649 100644 (file)
--- 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 29c82fb1439ffd9a1100062dbf1c9cb8b54a6a7a..1dc744f784c2fa4669febdcb23126b87f677f2e3 100644 (file)
--- 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 4fe9f9bf3207c19fd3f9b8fb66bef47ec804c1a8..fc6bfd2404b119dd1bbbfc525570fb0389cdaac8 100644 (file)
--- 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<RedirectStateData *>(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 e2efc0587e02c63075d7bae9c49a012046adcbcf..e6304378eab4ae61c0f7fb3f5de89b0e1def6a4e 100644 (file)
--- 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 49e8694355ea0fea0390575f52560720671ed5d2..1207646c875ef0b4716eb94b2a03cf4886803055 100644 (file)
--- 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 7afb828864798005662f4350a8b409aebd092ecc..e7fa291f2d018f90b3ef111d019d9afcc23a3048 100644 (file)
--- 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 0ec19b5b44128fff29c5e14b4416d0169ff30975..6ba58ef1e03eb26d55b9f40c16710ae881044517 100644 (file)
--- 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 aa67bc9040f3bd3a4af0ff2769c59c7c8ae4b159..793166361e374afad72aa708ae8d81042b4f6b8a 100644 (file)
--- 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 5ebda23c83c7a2a148cb6f7519fe6848f950a4b8..8c8d42d015c3eb06e5d334302ce0cd9f9e8f6723 100644 (file)
--- 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 00f3f18c66e60b6eaf43cbed041927ada688e419..db2017c55a92170bd25ec04e556009c6a43fe507 100644 (file)
--- 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 e51e047b9e53e5064efd9951e2db9168df0a8758..0e5767c1feb80c58304fcfcb2eb46f6e2f6d92bc 100644 (file)
--- 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 e4c97a305026c6efdb9bfff12e7a1b95ea8123a6..df6d43683d7d29f30d66feec71342da74c2aae4f 100644 (file)
--- 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 1f0e02b41b4c8d7d25dbff58dc24843325151859..2826afa4c570468907d17c360086a63cface211f 100755 (executable)
--- 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 f4542aa005f861eb047e13c2d8de04ca95828068..3fa275609408cf6ea99a27c99af875629eb2d95e 100644 (file)
--- 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 173bd543e559f2a30644c765c8b22854210d98c7..d7159fa9e55ebcebf88576216f8837889d5f8a2c 100644 (file)
--- 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 92406a5e500356c482f7864f14ddc6181c1b008a..9f0d3e989996e41e80566d05fba249f9916d4ca9 100644 (file)
--- 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 436c118b40cca1673623771674682c81e99f4341..8d13c529d0bf9efe47362aa0049c1095c945f54f 100644 (file)
--- 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 03b2e5b240d9fcf97b6eaffef44e0a513a48cbe2..b1d2b77e6f375b638421623cb660b41df769ada9 100644 (file)
--- 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 e1acebd24d6889d031519f4b5196c5f4c19dc91b..23f8b4fabf05bab8fc64acbecbe372602141ffb9 100644 (file)
--- 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 5e41179502aa02c1a915ad2273ad6f4e2121c35a..4b8c2f0e01d2a4623d818ae5dcfa7348ff04be2b 100644 (file)
--- 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 dd72ce429a466b5716b7444f86e79c62ec954f95..f9dae0992e9523a29ac54a1d9096c75293e9b347 100644 (file)
--- 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<void*>(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<void*>(this) << " id=" << id
            << " buffer=" << static_cast<const void*>(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<void*>(this) << " id=" << id
            << " capacity=" << capacity
            << " size=" << size);

diff --git a/src/sbuf/MemBlob.h b/src/sbuf/MemBlob.h
index 12115381f8987e0ed7a7a25194670ec38e3fb100..8a40392c75f93842abdb89517e69a8194de44d33 100644 (file)
--- 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 f35971d83daad67f2208a4fbe72f088d5651b8e5..4f1b438ddf24ed9368e7f62b769320115bd11997 100644 (file)
--- 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 be916a848093eeeec17902e6f02580b09ff7410c..d02f29cfc0114b959b780445d5b7ca9ba48433bf 100644 (file)
--- 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 3ef6874fa44443a28eda8605d2b3c8b58b14d70a..0d884990cbb6a68f7ac2ea6f34fb37e0882c352e 100644 (file)
--- 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 dd144d2a1912b4fd289b72cbac86a3f7e4a10ad5..833decd8ef86240bf94b3c1bec14c21eb1200c0c 100644 (file)
--- 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 5359ba94f3e7e062e2596dad538f5aab57345fa7..5d550980f1a59a61d8409117e5a0edf238ae88cf 100644 (file)
--- 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 a88ba77c3cd4e0f9e4f43b5b3ed435c6d5f47ee7..ca24d090664c7396ac3b7cb11f6e62bc8b80af25 100644 (file)
--- 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 5b25e775393cd9bfe1588cb04537194cc3c613f3..c05beac986cde815f120e1eb005453e4e2dbc9ed 100644 (file)
--- 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 b86b960ad3e5f64e986ea16c0ae557b1068427f0..d0d1c4a9eb136b5e07bd83a19a1885a0af7ad7f9 100644 (file)
--- 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 1710a66918f4643094d9c0d01094b7ceaaa9f619..37e2fc500e4839caba1063bbc7688384f6e2f8e0 100644 (file)
--- 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 653c99b10cb8dee3eda293920776f7c999fe7b4e..f2069d9f9da3adf67c61d669d1bae07e73b4239b 100644 (file)
--- 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 5f75db3f7e5d96acbab356b1adb39451dd6d7dd8..c6f02eb245c6fb5dd57f347de931c2b6bb936235 100644 (file)
--- 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 c21b1e32439318b1d4efb4cc496908584a9a5fbf..685dab72a684d23d6ae30947bc7334c15e4367f3 100644 (file)
--- 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 02a748bf07053415d54c322ac5b3ca9ee622ebe1..e4332eab1c5bb2c81c014dbe0d42865ce3b55d5b 100644 (file)
--- 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 f18024c4f7721c4079b54dabe924f2a75f739ade..99b35db2ff71d44942d7ad30ae0840a79d64e189 100644 (file)
--- 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 d481bf639906d4b7aac2de775de78fc47e274b50..a0dd150bb0fe61423ecc42f668ee4145ddc001d7 100644 (file)
--- 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 0f64f67d17662bc57f095860e70dda5e5ee78790..8c10408dbda871d3a9168e3c8001333e2944da81 100644 (file)
--- 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 0583ef2456da18f176432e74110f72df480b3fa7..a103b5b31d9de79835c8d8aa7aba066d51356104 100644 (file)
--- 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 7adefa5f189468e0c1162fc595cb08ad339aed7e..dbf0544c7662b1932f5b74dbd724ff1261a44578 100644 (file)
--- 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 dda5cbbb9a595d54769073114a1b94a77ace9d95..9ead634c6170e28a0b25fb88fc934673a5f59074 100644 (file)
--- 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 7c3aa13ce24eb4502b120149515ec48c14c12e50..f8f2745e38f2dc2ec7ad48b85308f8f243c96391 100644 (file)
--- 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 5b1b1e250d582f14c6848d7178ccbe190a7c741f..9307237b8ff1d7f1838999072acd65a5999a7907 100644 (file)
--- 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 cc51c6c84744581f639e68152a628380590f3167..b5ded80a1b5aa1a7cd5f9370ea4ba07cc09d2662 100644 (file)
--- 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 63aac7496f056bff9359fc4eb3ec4fd129441314..97bbc72c2a06b56f7b5d6f298f1d6a682426a038 100644 (file)
--- 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 bf165c7fcdea771661ce6a635befced23b83ec9b..56048c357203fbbab9a5f69487b6e20b4388c5f1 100644 (file)
--- 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 95afe2f91fc838615603cae23fb7f9e62af23c08..d9a28dccd4c01b08d1b6348a702d4edc2f0ec88a 100644 (file)
--- 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 623623b9e8f6fa5b438a268f804e34c2c5895f66..c07889fb99aecceaa37d3727054cfa77cfe27a91 100644 (file)
--- 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 30afed948051102e4fe4a9b4bdd00e3006402429..7c854a5ab3d5807945850754c0b69d932e4abafd 100644 (file)
--- 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 6596dbff39922ea5e42d86005389e40295a9e51e..b6f6e8a53aefad04fd75e4ac75db6fb7839b0821 100644 (file)
--- 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 88cf3fb7b537b5b1c97af1b70d62d4f5282f5588..e483bd55f71511a91decd1e3f16880db347d8ac9 100644 (file)
--- 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 56deeb8693d563a79e6c5c125aa416ae6fbb4a31..02cb623e1de289179b7079315b25824f35f5c801 100644 (file)
--- 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 d2d6cff3e3ee0d05b8d965cb040a485d541b774c..2bb4550dd29ac38bed87b3f9cd5f7fe3a05fbedc 100644 (file)
--- 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 e4ffff64a980ce6fb64b4432cb56735dd1457aa5..51523b9b8f09a4cedcda8727c321ffe35ee10be7 100644 (file)
--- 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 e9e61db1290dcb293b77b1e085d264f3d87247d5..c5e58dffcee3303af326dc57e1877f93f321d879 100644 (file)
--- 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 5f5dffddc76e7f5eca982e00db93b40d1615a7ce..3c290b3244b8636ef35c12dfa2913e13827d7caa 100644 (file)
--- 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 c5d5b8819def349594069a3c6240accda1b6b243..aca4800c8ac2b84c784f494178c245976dcb4b6d 100644 (file)
--- 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 b6849a0876cb6436454fa0a633cefcf7566b379c..1d0d8945b98ecc79c98716a7ed8ce8873089f94a 100644 (file)
--- 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 da4a44541934c10e7748e1c03447971a8075dfc3..b7abd4e60e1e14f51b501c5d88bc00bbf28e99b4 100644 (file)
--- 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 38fe2adc2b4477d6cd420d9bf20108684788968b..5aaff2269038f99901d093b499bfaed65068ffc1 100644 (file)
--- 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 0c4662dd89ef1475bc5f78d590e4959221aac828..082d89723f18e819bb0589c65f758055307ea8cb 100644 (file)
--- 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 d4e761a9c1dfe1b15e55e26edc3f166438f6bffd..6800a7042e589f3a3711d9219fb9d92d147779a3 100644 (file)
--- 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 3cb3204c5da2d64389afbbb505cdcd32aada9f7d..565f5b3eb9ca22013dc0fdf9115e5f8b0f8fc521 100644 (file)
--- 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 e6314130527ee2a776bb67f483de19d837553ef0..ac8c3b25deb6866435d79b59f55ad065bc56e210 100644 (file)
--- 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 d3bc547973777a13c772d2e5a55fc21ce97495d7..2d6ed1db9912731b2498cc535be9fb178c85c5a9 100644 (file)
--- 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 877d9cc829b694ca6f50146651dc30d1be9d4812..1187158a30b91a441983addfd4ea11162be285d2 100644 (file)
--- 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 ab11e42d0d80a80e76d06c0d51ecc4f96664abd1..2b26792e15c15f2dd90810f27869940665a8237c 100644 (file)
--- 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 413a200d49aaf1c1bac80ad3fdc18dcecffac2be..5b96dc6708482e23a892dc64aa13cc62e890ba61 100644 (file)
--- 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 7fec511c6f0c6175b6fbec75af36b3b84e24b716..538c2abfa8186aeffa3904409b1759f50bfefb0e 100644 (file)
--- 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 92dafefdb261447428614de34421aa98f08d7a1b..2d34c76cfcdd8314cca76bd48e055e8f3d443b2f 100644 (file)
--- 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 d5eaf5f637f34e94a3e971140f9b8bd14a15f787..59bde9f4141ad830ee5db0ac2fb8b2bbf06363c9 100644 (file)
--- 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 891fe0c6b2d5733c326c896d49bc57ce5a481b21..5aa8b0410994c90fe98bfd34ea0ab3651f9afb47 100755 (executable)
--- 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 2b665a38ec2db22ba833e2e8d6d71b4253e0a27c..81dff7e6eb26c3875eb1b8b53ddfb3113c6eed68 100755 (executable)
--- 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<Christos Tsantilas <chtsanti@users.sourceforge.net>>
 
 =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 3cf2854e25fb676cc2c068e4d806facb67e4e3fd..ed558dd9a3c7fe0013c46a3504313c352180dcb7 100644 (file)
--- 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 7cf1c5eb5a285e584a98d7351d3330f7f9ca9a10..efb840871f30eb7d672623200a46b641d050bc71 100644 (file)
--- 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 ebd5498a7b32b6ed912d0e1b91b432d594d967de..859900247cc11b1068fac70f49557f282f1ede4f 100644 (file)
--- 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 181c2f0f99bf3c0131fc2058f29a12be964880bf..6dd74edc186b8474ea83adad721879d340c85307 100644 (file)
--- 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 8a14144917d8e32e365eef16c8c1d97add95c92b..d22148c5a07674f252b0f37725fe05028b3b5084 100644 (file)
--- 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 bcc3b1746a6a3a04c359c17b7438756039801d3f..c1af0478910c24755e27b0b86eab6021a243fb24 100644 (file)
--- 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 06a31f342fd4283f04a66918152f6ba1feecdaf6..c672d226e6a91e8404500e189c087532675b318b 100644 (file)
--- 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 1dde7488584d41eb8b36fb260353685a1cd14065..a69751c2d8eab9778b0580dce6b5b89cf9cb84f7 100644 (file)
--- 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 2cd59f2748dc9c752a3427a8eb3fbe884d591102..f6b40c178dbbf7e835852729d8b1388f8f30d99f 100644 (file)
--- 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 736365b0eacfcc5c8aa49b045b084cdc0f93fc9f..fec88dfaa4cbb3e3f0a6fe60fb02eda603532f25 100644 (file)
--- 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 ba2bba1286329b94877d82fd213a13d7e04d77bd..ef105f502861409549973f704cdf0be53942e9b1 100644 (file)
--- 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 592b0268edd8ac1b2f0867e57974b33fc0fc53f4..4cdbe85f57744df25dac2e7043c2bbf15bc21ebc 100644 (file)
--- 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 c120976f965661443d30a2e1b6495b920928e9a6..3b4c1a5fd26b4e0a938a690075d5e936f6c8e768 100644 (file)
--- 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<Forwarder, CommCloseCbParams>(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<Pdu&>(*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 7d415af346cddf76b5f080e792e034f5d7420ede..d5e9841a4105e64bcda29fe03a6772de99850795 100644 (file)
--- 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 a9d93bca98f420466712c506f7f9e5b20b8cdd8d..df47ad4de1e04c003028b63040783eeecbf5eed4 100644 (file)
--- 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<Inquirer, CommCloseCbParams>(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 3b8ad11fdec20bd992f6a8de41138a86deae5da8..7ea033f1da4df18ebc63a7647013f420bd4eb77a 100644 (file)
--- 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 7d0e15dfb80db0fa66b49ebeb29e34b1b929df74..29d5168d236be0be5aff6746cb9392151e7bc1df 100644 (file)
--- 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 41f31d9ddd2c6a0e363abddb0747095306b7e3be..978e4fd50704396e9d6d09bdb9cfbda7a2c417c5 100644 (file)
--- 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 84ca89ea2dc76d484a3a2c1cd97851c928c28d10..63d13a804ef50bc987ccef912c58622d34759772 100644 (file)
--- 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 b21aa3958e4775101fca5d57daad4396c2fe9d67..3d21a5fc18d5e5594a3c6a439448ef7f93b261c1 100644 (file)
--- 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 dd230ebf825524373c735ffa83ac27f8ad6a0518..89220e42d01e6ba28d4b36a812f815102678c706 100644 (file)
--- 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 baa8fadf6a5c03d0a234681907d3919cc874cdde..1517851dbbf40df7237b1b239264b7ee2bda0929 100644 (file)
--- 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 52c6daf497c1b4741c27bb034312a8394f261021..dbe8668e9b4ac5e918a50801aa665b72a5ea6c7f 100644 (file)
--- 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 dc129eae60be2104f593c67f67090ec228e04d43..85d2388134694785b8a5352136b4771f1a6b4fbc 100644 (file)
--- 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 3bd43f62ea74c520dff2cb4d3b70cc25458a230c..92b36755530c8491cbffc5f76831b3585d726a27 100644 (file)
--- 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 75eb4af8744f6bc8b391b83d37dc880aa889f46e..f0f54e7bde4353d4683ba12a0f085529b5a8c601 100644 (file)
--- 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 0240c7a4c53103ed6b7d32d877084f08100648da..07b1b1bca403cb926f0b8031de89d150350068a1 100644 (file)
--- 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 b440bf50f7b4fe073d3a48d8cc8cb31290d6266f..d4c9aa21cc58fa54b25d0d9d91007157c3197b4b 100644 (file)
--- 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 b8d7a22a899e9025a7e08ec4a170ce12db93eeb9..ca93bd2c204f51a51d8d0c2e2e97ce770524771d 100644 (file)
--- 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 869c661fc2ed9a140f735a945f439602af627667..18cae5f0b0422bf387dfb5f6c2741c2586d14b56 100644 (file)
--- 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 73454773528937ae9575cb972ed95e7726d56187..cb847f8a246c930ea1e023c41ace00e52ceec101 100644 (file)
--- 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 fa7eb5e7f157b63413746eace221d6fbbb567376..21acf5c1a69757c29e0824dad8b09d7b9e41c7a4 100644 (file)
--- 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 e4bcac1ba499c9c109da9a0a14e19bfcfacce97b..7b5bd8ad0f54eb90247fbd5f1b79d02d83d536b4 100644 (file)
--- 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 d38900bf21894ec811a8906da9cc9a9ef5bd2e63..3ff1dbbb539dc1923367884ee1330440228eda11 100644 (file)
--- 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 5ddd002fa14d43d98f391f45be636a3c92e6b6e7..3bae0d4dac6d620c4bf051a8efe62b5f6bfe40ab 100644 (file)
--- 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 034139a0f42d39806be42401da08d07729aeffc7..c97fdb2c29b6ee0a7f8e6b981fc2a2a6bf7124f9 100644 (file)
--- 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 c53cea71ea73e5b5fe2eecc997717ab6a78bfe36..da4771b6dedb958ef7d969ed47d0c1512992ac18 100644 (file)
--- 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 4195192091329ff66ce2ecc610471837b0847c39..44a605e9e589ad1bba657913a106bb5d24c1af54 100644 (file)
--- 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 523ed29351c97adbfacf46f369a54fca5dd2d215..fcbfac4e31789c028dee620e9eed5e2121ac10e8 100644 (file)
--- 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 179ec4e8b0f7efdf88b5c854085b7baa38ed6f1b..745f71ffd5c8dfd57f56656877eba2638b0362ac 100644 (file)
--- 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 2cc422a5100beeef1a89df990bf39db0f41a43ff..879f7ed745cf8589c1b5085695998bff58464f54 100644 (file)
--- 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 944ff24c135da018d45a1d2fc71066d2913b0d30..b50899d90cb075529fe19fb024c5a80a6b826471 100644 (file)
--- 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 d5ade7c2ee93e215b26e619474e71b3215b9ef56..711beb5f38ff348c04feb3c6caa68d5bfbb4b29a 100644 (file)
--- 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 40e49b85986f0c1880ff742167880a91d7ee8a9a..0313be286026bc8489a31eff4d407d81c61e3782 100644 (file)
--- 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 3aa5b44244c3a5c10353767407a4da91138aa3e0..e7ac2ca99fe1f220040f29bed9b62764a5f6b438 100644 (file)
--- 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 dd7d8539e40bd62a8f6703bce2de24d7322bea08..55de1fc92909bda7685170ced8dff7d0ab878ed2 100644 (file)
--- 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 cf9c74125d753b72d2a6ad4c6af5367a29ffaacc..f50f64cb0919a024abf47e6ff7d545904d6b683a 100644 (file)
--- 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 33f12513844500f068e2308796ebc0306cb33215..b7b691eaa3804e68a432352f96739f9337dbdada 100644 (file)
--- 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 70c85af923b7df59bf3ab7c0a300f80607f53222..87a5b4862408a45f9f7adaa3d7a14b99a99cac73 100644 (file)
--- 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 73a4db795aff0e362fc83383fb993eec54404a67..657f7c91e1da5bb3c6499ce0d04640aa66180e6e 100644 (file)
--- 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 541cf718c6deb98700ed5537b31d4adb62ca13d4..cc59a1a0ad86341ba779aaf2b6e67f4bb5eb326b 100644 (file)
--- 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 6b2e1b014b70cd54237870180d66751a345de41d..e96e35a0fe2be940e2de5b63d4fc921fb4bd5f0a 100644 (file)
--- 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 99fa0f8b9bd1a505a1bb76ee58b764b944f47684..6e9bfe2549db983d8a16fb5310b9afbf7be027d0 100644 (file)
--- 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 6d89e6e44e32303116a2d6cf701c3688f5a58047..e836546b7ce233f44203121e7d518c91a8006c42 100644 (file)
--- 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 062c1b0aee8ea3cc8e087af018b6427e43baee8a..3c4de81b07b0adb7ca30d7e8c30a5774bb9f1deb 100644 (file)
--- 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 f991001586786366def0a0050d0856654ac0b9f0..91ee78bc105026dde91a47293e43456ad5a82492 100644 (file)
--- 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 260164e02e439a05d903b64a9777c478738d1fc4..42e9215be39c12a326b858ca2df59155ee900272 100644 (file)
--- 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 505e13db2ba69b87301c7d7eeded3dec7b7bb255..ffd4fbb1b6de652f1f6aca9231bd3cf20fd9ad46 100644 (file)
--- 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 83eee2dde13ecfca86d2617d1e4689da4455c6b5..1b402791bf7809ea102e457093edb237b10fcf47 100644 (file)
--- 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 b35584579df1f8ea2aa6389a0823a76e19409a60..5b284daa05c6b46de7c6d66cc529c83b0c22a276 100644 (file)
--- 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 f50b20b5431988498dd81c5f0c91c91eb28b290e..7ccabe98ee18ca1a221c6e56e1ece62496688aa2 100644 (file)
--- 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 851caddb6ee374fe5ffa0d5370a36bff0ed57683..71c1fd4083acc5c8cb7cd87693e7470d1a08025a 100644 (file)
--- 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 9e1eec812ee34e120cacfd82a981ecabfb100f6c..1c8dd03bf7e77f5a6f795c78bedd2cb9e2f434da 100644 (file)
--- 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 92337eedc82af34fcea5d5224c0e77adc4da09b7..4cf5b9ba810163e094edfceb4a5755a89f88514f 100644 (file)
--- 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 5d7385f6347985af0d8d657f3b58c8c3a4c23005..164e18faf416a62465202f922dcaa9a9ec9eee45 100644 (file)
--- 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<StoreEntry *>(static_cast<hash_link *>(data));
     assert(e != NULL);
 

diff --git a/src/store/Controlled.h b/src/store/Controlled.h
index 735708c94d967f58e7e66b95810453cd3fad46db..7f4f7be09d6fead652409be6d48f677f4fdc6492 100644 (file)
--- 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 5dbb20f68a6b29f9dd9c3310a91972e1c63148f1..56b80f05d4991854258c5dcee4022ed01d858d52 100644 (file)
--- 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<hash_link*>(&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 a74695b9809089a404184e62ea6e00a380390d22..4fb4b3ff76168c187fcc938821f316f087ea0ad4 100644 (file)
--- 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 1fff636e583f20b945ba7f248bbcff11895a6d37..f89c01fa168c0bafa661712252d0e827acc45cbe 100644 (file)
--- 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 << " <? " << max_objsize);
 
     if (EBIT_TEST(e.flags, ENTRY_SPECIAL))

diff --git a/src/store/Disk.h b/src/store/Disk.h
index 12b27ff6cfb296ecef315a26d540890dd862ebb6..ff7e1c82f47acd01d3a46a4c062ec75e9638c8bd 100644 (file)
--- a/src/store/Disk.h
+++ b/src/store/Disk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Disks.cc b/src/store/Disks.cc
index d69c4f5a783f05a0c91532028c8756b92cc79527..d9eeb10213f41e21419e92bd16fbece4603a598a 100644 (file)
--- a/src/store/Disks.cc
+++ b/src/store/Disks.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Disks.h b/src/store/Disks.h
index 9c82df4e4274545f78f4d28b4b3c0c51d514d167..8384014091552bf27b1320f083adc59aaa747e5f 100644 (file)
--- a/src/store/Disks.h
+++ b/src/store/Disks.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/LocalSearch.cc b/src/store/LocalSearch.cc
index 22542b75995907daf2a072a05acb2e31b1266a04..18620248c588e4cecd6b2f9f793dc4c24b00e50a 100644 (file)
--- a/src/store/LocalSearch.cc
+++ b/src/store/LocalSearch.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/LocalSearch.h b/src/store/LocalSearch.h
index b9636a0c0883e284ce01acc334111cf030e9df8e..b33c217f481c5d5a91accda0fd3f924482a4af96 100644 (file)
--- a/src/store/LocalSearch.h
+++ b/src/store/LocalSearch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2022 The 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/Makefile.am b/src/store/Makefile.am
index 7aa3219eec24048762d259b93e7a5b08c1a8a9c4..e71cd7111ccea6d7514f8e3b754e5e7cfeb8f38b 100644 (file)
--- a/src/store/Makefile.am
+++ b/src/store/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/store/Storage.h b/src/store/Storage.h
index eab634dc89facad7dc79b06cfb688b0a0ce53300..38731e4dfb62a157c18e000ad67a1be1cd284dc6 100644 (file)
--- a/src/store/Storage.h
+++ b/src/store/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/store/forward.h b/src/store/forward.h
index 1422a850fca0000682d49bccb5213a8da5988355..0c870ecef34ca536fdcd3a299c2c461fc4959afb 100644 (file)
--- a/src/store/forward.h
+++ b/src/store/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/store/id_rewriters/Makefile.am b/src/store/id_rewriters/Makefile.am
index 233ed71aee2ae580cfedd1c7fc10a0f24322ea69..aeb3e64ca36296f8d0e12b07ed2904a2145501ed 100644 (file)
--- a/src/store/id_rewriters/Makefile.am
+++ b/src/store/id_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/store/id_rewriters/file/Makefile.am b/src/store/id_rewriters/file/Makefile.am
index 69e63763634e317f24c9b94db1bed5acff2777ee..b5873f8f8c9683567025e0b0f1eab9d03bb71b52 100644 (file)
--- a/src/store/id_rewriters/file/Makefile.am
+++ b/src/store/id_rewriters/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/store/id_rewriters/file/required.m4 b/src/store/id_rewriters/file/required.m4
index 3fc1b2133d7afb0353225c131c330dbff30dcc0e..14cfb1dd05b19890ac3f151a996866390ce12f91 100755 (executable)
--- a/src/store/id_rewriters/file/required.m4
+++ b/src/store/id_rewriters/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/store/id_rewriters/file/storeid_file_rewrite.pl.in b/src/store/id_rewriters/file/storeid_file_rewrite.pl.in
index 6ee633ea377548cbf5a7cf99831094426065a28a..ead38a180e9caf59950131f1540fef498f934fd3 100644 (file)
--- a/src/store/id_rewriters/file/storeid_file_rewrite.pl.in
+++ b/src/store/id_rewriters/file/storeid_file_rewrite.pl.in
@@ -44,7 +44,7 @@ Based on prior work by I<Eliezer Croitoru <eliezer@ngtech.co.il>>
 
 =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 57fd136ba0826669926f4d307e4faa1294018f93..fea459a7f875c67cab030530c7b3871e9714fddc 100644 (file)
--- 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 38bd2e08fef895ec57141f411e389b02aff20bf2..3b5856eac9e0730a2996cb3583950ea813173051 100644 (file)
--- 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 abc7e1be9287c7118005fefe68ad042f8751f5df..d6e5a3f8b302005fca44b00c2af75d00621c6d55 100644 (file)
--- 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 682794f96aca06e648e91c2d426e5555eb916859..934b8492bf59096a466cec0e3bb6b10e91539bee 100644 (file)
--- 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 3986fc03093e07bd03eef3a311b001c400ac2f8a..7fcdfed7a8f287fd1b424a3588cc9db047c25058 100644 (file)
--- 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 60440f8db4def25727b8d3305646e9fb492cc127..4e33ac2ec7c7480a7ba57e2862b46daa33d3c89c 100644 (file)
--- 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 3e9bd4262330bcb65b200abd7dedc7f3e93905c9..3bb262c84c0fcdc001d688a61d3620b65751a27b 100644 (file)
--- 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 f7b70d963f92e01c9003b477b3504a503a6cbc48..2357c8abf115aad7c9d6425fcfc97fd7245268c6 100644 (file)
--- 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 fc0f4962c67adeeef0fbcbd976b61c42fe39bfc7..acd604fbee9ab37621631b25f04d36822eb3045f 100644 (file)
--- 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 13da2ce0cd8a91a7dd6468ed51b348568a6c26ed..c994c57a0630964c803d9cbe34f4e3846573c4f9 100644 (file)
--- 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 d99d2e6fad8b2483fb0a27dd1deed20ecb939ec4..4a8b6eed8b9ad56d9e69a1aff028207406fa9574 100644 (file)
--- 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 9e9c3c3c5b23645cdeca9a8e0336d3da746f8b43..251bc2fda1de31d6b390e7d9e92422ed114c5503 100644 (file)
--- 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 3d2872621d0364517a37cb8c34a3990573842ae1..f9d4a428714b9bd25302f2cdc925a6ffbfd48ac9 100644 (file)
--- 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 123d6d4579503993814fe65748728bb782a1d1c0..8625479d789027ba1c014a18d83018783bf20bbf 100644 (file)
--- 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 abb2635ba466eaee405e9cefc42cbfc4c6cb8bf4..355f37da321532760eaea5e910d4622b75959dcf 100644 (file)
--- 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 6af83604690cb6905242417549b076e698a78a42..3dd9d7193010324ea3f878d4cb3e1e5656f01113 100644 (file)
--- 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 d495f351ffd480b4f3d9eaf96d9055d8448b2369..e2ca892cae2d1fca764eef9c9b220ada447357fa 100644 (file)
--- 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 c60624c988efcfe156e30bf8fa6c78d628501ed3..1742e195dd8e402a0daf712625e1711327ad036d 100644 (file)
--- 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 eb523435d71ff39c5b43f4cba9ce6910dd518112..2dfc176fb655a976d2b3794d8b8953251c84eec1 100644 (file)
--- 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 b531a2d944e2df95c562ab0f6f4349e1da6e5a9a..0b3f78ce49caca6ee90d9224bfd64c175e42c4ba 100644 (file)
--- 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 9d52e2b113c20c1cd52d7886fed0c56cca2e2036..55d799bb451eca36cf1e1bbe1b97dd4213de692e 100644 (file)
--- 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 5124c7de599665da1821ac869f56109a7ecc4ebb..6585cafb64e8d84737f19f2b2874347cc8ae1474 100644 (file)
--- 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 43ad158631cfdf9c9d78955f48369dc808516d0d..200c058206afb65551d1b2c90938cbf71d7d6dfa 100644 (file)
--- 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 177218686b3ff343b26e9aa18cf7235f6b250621..ee85802fc2b473d1898e3c02ced370017e5e113d 100644 (file)
--- 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 eaefbdd6823949fa930cfaaaab468d900276db9a..1d9f373a77923724532ac6db0d62fa8890931bc3 100644 (file)
--- 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 fa2366109bf2198fb10ab4e44bd092c985622a41..abb4ae2ec1f95e2c07abfca9d8f0e7fb7ff1f7d9 100644 (file)
--- 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 1230d38d0170005e6e9e92318a2598685e15c355..7f58c53ab99b045ee79584b2630092a455455090 100644 (file)
--- 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 9140c9e8e7dd8286cd7297f4d52135985cf76813..7a93df2cceadbc236d2bb219a95aa0b21816b807 100644 (file)
--- 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 799b8dd252b1550ca35d9c0b20842575cdffeefd..23942a09bb0b44b6393af57ff099d07440a4a832 100644 (file)
--- 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 035b29cc4e19693cb06e70f12575453cffd195fc..d74141e071598d971180ff73206fb1cbccd6f7f5 100644 (file)
--- 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 fdef57fb82dd471c0ae92e7352ee39ad6f3b8795..2d61d1107876c1b8d9a4bc4a62eaedbb0a9e033b 100644 (file)
--- 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 5b282df849ea311afc55bf9288b29b897dc412e2..636ebbf4957217428c8612ceb33b97c0d2b1691e 100644 (file)
--- 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 906ca06cb9ae169347232ae373e4e6487b0ad673..fae702d411e31ad8d51008d6093733c3dfe562f6 100644 (file)
--- 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 7b58589de59fc480e3d8b3314b85f766efbaee6b..3111855696bae3caf8fbe1404cec71f1fcca33cf 100644 (file)
--- 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 005449d6d79ed80d4ddadb0e1eeaf1943e1b99a3..184d66e81edee15d4e3324f9557dc1ea4a563cfa 100644 (file)
--- 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 c271ad10d11ea19ac1f274d49f7bca455d6998bc..3fdbcca571a7b1e2ae06c6a90b1d8333ebf521a9 100644 (file)
--- 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 f1278ca6e841bee79f44ea6e4d3cdbcd57fedd4a..ee795525f299883afa9e1e852a66628fc3a80776 100644 (file)
--- 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 161991a32f129423106fcf3e2735394055df9100..6d94beee9e4d04f4fd1cc0c465b77c912472b0c3 100644 (file)
--- 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 590c8d81a51d6f631cf0d8bf3df81bff74ececc0..bfab579c295c5ce06976dd2b1734d54fe89aef31 100644 (file)
--- 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 099b8be8708692d5006395ce1a623f378649dd6f..e9dce01ce1a8bd4a16dcbae8831651ec39b8f8cf 100644 (file)
--- 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 f0692bfef77b3c84a1b45ab0985a91c218801b41..ff4e08dc76d5bccb4c615739f10ad92438604c45 100644 (file)
--- 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 21a9f0ae9b08bd6cf37f9ff3c012cbeac81291c4..abb4ddd7b10541a8de6a80292e4a573c4f8e6a7c 100644 (file)
--- 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 bb0eb4b9607807bcf18617ba013455b8f6844275..f0d30a7570a89df5a171ad4bb34a12c25bd0112e 100644 (file)
--- 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 c9baed93cc1c0d4081dea31bcc755958cf906d2d..42080c9a21f9332d5e047f169c53e27027ad47ad 100644 (file)
--- 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 e37899488dd718f0b5bb8e8109f44aa3e99b1725..a4dceca76fcc0f599a0f075848b183c3ac34e0b4 100644 (file)
--- 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 1eb0f9370da8a3ff04d6a4c9024ea4e19037577d..588d34ff644793232ad9a0a4b1729cd77125e586 100644 (file)
--- 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 8aa82deb724f339ff28007a15b95e6c79e40e9f8..0af415f24261a5152f819f3dca680943f0590f6a 100644 (file)
--- 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 dd01fa454be164858c92a33e40c18b8201e12913..c27b0d00dc011e02f9fcfdc0a478bcb9410a323b 100644 (file)
--- 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 12d5bb70a5385f59109ffb8d7e14c3296229126d..cf942a792373890352828a8e0b95e63735c0f7e6 100644 (file)
--- 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 af38cb8c5fd9351c6d415588626e3995972c0c52..d21df483f98bd6aadbdcf5b30f30200c08b184a6 100644 (file)
--- 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 e112faa29f0c68525fe61b59575e75cbab6bf79c..2fab12a18c506a23be6e37f1223d8be983e4bbd5 100644 (file)
--- 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 3f1a9d7717403f625566cd2d9d4810ce4e518d63..2ee78c85555bf54baca41331208884a9939bb26b 100644 (file)
--- 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 538f56cefd0e1002ad3d8b01c35dfa58a1d4e572..3f8169b9819f9f513035234cb5131e56a811cff8 100644 (file)
--- 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 bf979d8627d4a415ff48601dc08f4e337d5e9f45..a67df93c3b1a3cfa87d543d762581a51350389f4 100644 (file)
--- 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 4cc9abdc28de8078e1c512455d849a82c010276e..58e68f765807bea1436473c7c6c2e2c01347db51 100644 (file)
--- 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 6c8ea24e145a53b970d5dac8560867d8434209ea..c1e439cedace10fab9cad24942f39c53b62bab7c 100644 (file)
--- 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 607e4e88190fa19d4d4db76783378f59ddb41fc8..f86e93356ef81a578af62d61fc08f69804531c30 100644 (file)
--- 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 3ce8119ce666fdaebef9e71018f9d8d84b1fe10c..73c043cb3abeb3ce6a12080965643c76d1f7e171 100644 (file)
--- 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 55e5d1f2778a6e20dad34c958e789a82cb44e7af..ba92c8b7c8cd0637abfa83ea911df331b0f4eee4 100644 (file)
--- 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 2c64338866f0dab566f8cb3ae968336d1151edfa..de28e75b9689704bca591b27232ef5db94b91141 100644 (file)
--- 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 7b786ab88ee010cf1468a8a258f045063f097ad5..6d562dfd30c15b2e90476ad1d896f2a29eba66a6 100644 (file)
--- 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 12ad932fc9a5e57f3e20f1d9d5871372db70f889..8b5a34479cb69618d1dc8736ed98e22d3e89641d 100644 (file)
--- 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 15b7457ca54f949c50b668e83fd16249f3a3d0f9..e6361eb0eb6893912153e925ddf126db280318ac 100644 (file)
--- 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 e77014c446f3c78cd1ed4ea843b8b3ea8779c17b..3bc612fbeb90c2f0178ecc9e7707fa1ffbc93d91 100644 (file)
--- 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 4e5db53160d527ecde5779ea4efa72fa3768d241..2dc56b9b3833c50252d37d20c587dba830f1f1c8 100644 (file)
--- 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 7e25327f89e36b1acd6550715bbf80553c0d104e..21920be1ee9f397a75731aab90e4f27150759a61 100644 (file)
--- 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 575d5eaa44a9e9a06b6fcd3ba7dc22ecac8a1e0b..26b02c902b1c29e8fc683fc44c9e199aabe85921 100644 (file)
--- 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 3baa31e43865a9eaf11d8e25db1d9ea9ec6334c9..3437705f7a5dd9fd350ae4839a083f195a0f8a71 100644 (file)
--- 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 0a1c5a8131ad3af3acf076a5c133d58a37c474ba..7068357b60bd994f80c53508cb52e34cb7c1a109 100644 (file)
--- 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 0b5bccefc1e1b0238b2f80a346cd84c35844c165..39ab1ebbf4346a26a2e8f6227da3c6e8d376e819 100644 (file)
--- 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 f25e082eee5310fbcf28704afa3e37802e8dd362..a0dc053ea02246a3244d2c47ac02ecb392168954 100644 (file)
--- 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 3c7ddd6fc587258b2af2fe524bfad8ceffbc209a..285cffa92b9cae3dc9b60f0af219d75c01b3eab2 100644 (file)
--- 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 cbc9dfa8b0617dc20b4af6f9f165ea37ae94696f..81a8e09295c6a8ced36f3ad8e8324633e76bb307 100644 (file)
--- 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 b798f6a2593e3eeff3fb8278667fd9867df1a95c..db6b138cceea1348107c7d41500775f6af60fb71 100644 (file)
--- 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 3d98c32fc6671510efaa3cfc0a307485c283fa3d..9985b61a01d00603430b941950d3454c8973d6ba 100644 (file)
--- 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 d9d3b061d831041bb47c31595331691b3d8b3126..6459dd2de841dca223d4520d6876307eb3f7bac3 100644 (file)
--- 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 555cb77d79afebf9fd760b39e20182565cf259a9..cdfaa471e1862046b2554203c394a62c9f5ae085 100644 (file)
--- 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 b4250c3aefabb33b90f63a22418a0ba39fdbd51a..55042acc044a42cc7d6a353fdab65daaf7d1012b 100644 (file)
--- 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 c028dfafab7c16f96417c17a7b6811f1e40876bf..669b2457a2886754df3097cf3f41619b5326732d 100644 (file)
--- 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 50c20ea597e45320bb9f3e72e4d973309f25f6b1..cdc61923adeb31a725d5037f8c8d8567c53392e4 100644 (file)
--- 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 5feb3729b87557d49619201227e1a4fb89c7ef36..0419ffe31880f1361dfec5f4cdbded981c629e9d 100644 (file)
--- 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 efabcfbdc03098f1a017d2c2daf191f0de2754d0..658fe8af6fe2817f47305bd42762d30da0815c2e 100644 (file)
--- 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 fe24d113df2d0d7860d101982ccc8110d7567a89..32b0d3aa67e68e9f195d4625b39c727be5919621 100644 (file)
--- 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 25f4a4bbaa0de9338d6d9c40157297c1858e6fad..acfd117ec9fd5682b5d095f7760fc1aafb43412a 100644 (file)
--- 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 d8aeac088cfb17921fb072da961594f2a35e42ca..f5f94c99b89ba130bbd3f3750b7f1b141e166c06 100644 (file)
--- 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 cb2f292cdaf318c3fec01dca8768bc64053ff36c..56eb1d725b4106f785e090c8589646347d238dcc 100644 (file)
--- 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 79bd8c71b20463b2bfffb6997fbc4e4162d275c2..b0a1ae109bd115a10b5bf2068e36090bf1072dea 100644 (file)
--- 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 4a51d46bff27387b015aeacbcaaadacc12a4037b..5197d04184f22eac107346708b5d089d73cdd9d4 100644 (file)
--- 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 48b11d38703f0d7a4ca247e5ce6a1add228e7d78..75a231888802438eabee3af6075ad86c29de7a18 100644 (file)
--- 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 743f942285ff77c855b8ab2618d480d205400d94..107aac96b678d4dc304c391ee4350e5cf81d28fa 100644 (file)
--- 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 395e52fd8622e2cef6389d9b15601c87c9359609..e9df260122c69a0fc101333c5026ae0925306555 100644 (file)
--- 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 fd340dd718483dc6f58d5c6fe2ed3d5739a26142..e97e5c8d676289a1f01692ea7d6a91b2fddc37f3 100644 (file)
--- 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 c7fddee9d896c1846da6cd4931fbbd6deb564445..f6efc00148caf808bb3b799ac25b92ad4bace990 100644 (file)
--- 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 81fd81739b6931c7a93e2f3b7ca3cd14d0cda4d3..8c04caf8c31f7e79029272f49543e2ae225bae84 100644 (file)
--- 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 366a4e4bbbbd3ae38625596185efbd917e97d114..3c51c793cf1f82db40b90abe6f58eb2e941ca083 100644 (file)
--- 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 3fa5f4290f37a5d7f48f9c39ea57f58b4eb841a1..44b1a9b2a586578072e5899636fb1605576fc498 100644 (file)
--- 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 5c2f6676591608bf035f7fc25c16896b8fad58ba..89457791cb9929034aa0453949839ff923f07844 100644 (file)
--- 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 564628733e112df3e61f4def6672bad89e15aa09..2bf80f1ece7aa1d6e46ad763c692a9b40358fbc5 100644 (file)
--- 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 a56891d486d5e139169e297a669246f3644197ec..9d0e2b80014011a578e1461e8b0b2870708e14af 100644 (file)
--- 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 e4628895bca476c0a5b2fb8654e8cc05fa034932..83852e8fe55f289a7195b45a37f5962821bf9131 100644 (file)
--- 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 71a51196bb2ea17cae5e5d1b85230084d324be0a..231c2694b3708a30e11bbf24e03eaa0855d56c70 100644 (file)
--- 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 6cd50ac91d873c0fc6c8d9945178fce0f6bfaaf7..cfd9cbe7a43ce10a31e08a9bb84eb701087fc752 100644 (file)
--- 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 3b8a42116ed92dd1b879149eaa0418a071fda32b..b45b82809e2a4f4230866ccdc46f55da90a67261 100644 (file)
--- 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 089ca57f8855d27e654f05d81f0bd6e9e407eab6..ae2ee9d25f27553aa79bb3fa55757ab332fbd714 100644 (file)
--- 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 36b7a2a7edf69e878ab8428e8864d176620a6d29..0b4707b83fc7455375e0e78532c24d8a79b45b83 100644 (file)
--- 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 53a1ac9ac719ceef20bf76baa179513f4bbe0511..4509fe2570fe9d66fab39d8df0a45a875b899440 100644 (file)
--- 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 6bc571d457d9d4ecfbfd21337f40df3abc870a64..40beb7dbdffab72da930b7d7c59a8e6fadd3df09 100644 (file)
--- 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 91f1d7fbf9de5283b3b52a21c5adbc78c72dbf1b..c0318518d5d2cb17529964fc609f88a449e20b6d 100644 (file)
--- 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 3ac8596b2d06b77f9f35e444cfd6e6d750bba636..451334f7fe91bcb6aea1bd902e05da0959fa1928 100644 (file)
--- 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 7adcbf8500790359641931a09bd375a68c037c3d..b86b21b51633a7dd94a04dc38751932a62b8b027 100644 (file)
--- 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 118c3e3212987ea6e2aff79add14b0510093cbec..3edb09a791b2fec61c6f0d1e5078c8602a0556a1 100644 (file)
--- 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 747df6037df9b9c410d8ceddd3bbc99c7fc28977..6e556dc3d2f120fa7315158aaadfd0af36db3e32 100644 (file)
--- 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 0fa5eb99664142278ce810671de2a34104db6035..440e28a4f1db8a853ab59db90c5cde7a77cd9bf6 100644 (file)
--- 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 6e20ecbbbb70aab2067a9660d5e97352b902797b..6f19d98cf96f0e0ebe3ff70cbb475cc658385534 100644 (file)
--- 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 d5931d3f33d24bd058ebafa39c5ab0a5d25b2e5e..b238b01fe079a1b379499c482bf17aafe64ef657 100644 (file)
--- 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 2378278eb8763ab37d83750b3c101d226f55d33a..d6f06a55405f2f66124f8e982010aa71b49073c9 100644 (file)
--- 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 4aa22fbf47123b8d87c6d4a278e42f14901cdb14..e9cbf6cd10d9733887a9250511354154b47aa7eb 100644 (file)
--- 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 476d87983903a1ba862c586a2fc03b2cb005a962..92fd56eb1199a28a7ac40196c95f4164b419d487 100644 (file)
--- 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 290c54b6c68d85c0ef3075e14870126393fa16f9..9e3e61d9a0351729fa3f6db4e6437cdbfdf6a948 100644 (file)
--- 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 fa1960afd2ddf7bf5d20b94c90079b60c3d106f1..86b0fc8c5ad871f969fea1fe9c3b9f3d1a93b0d5 100644 (file)
--- 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 ccee9eeba9e6deec8a262e8854d2b3110f7db2e0..e61b536a87fa699b5cbd49e8565d26c42eaa3dc4 100644 (file)
--- 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 4ca6179e8725a50d368ba1d87f7b088a188ee1bb..c0cafa4729aab0b0d2538958102424ceda93b5ed 100644 (file)
--- 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 d081e4451fc8108ab0d136b8469d704a00cd2674..9e8b26bd7720f532e469969e9ebec45208953bf5 100644 (file)
--- 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 7bddb9f51f795c80229b9516ed6f4d3aa31e1129..242deea05e864ad9c5a518c8fa32c97fabc9252b 100644 (file)
--- 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 ce29b1f7d4b35e3b5a8caa0fdac268e8167eb79e..c60cd7e25e154f19295217a45fcedf9844510474 100644 (file)
--- 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 2028c28962714a186a603703c499228e6a7f2aa7..c24a6422737248c75cdcff21348c3dd6f3b78415 100644 (file)
--- 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 cce631b129889947f382737b12a0bcc354f3ddde..bdff2598ebcafa5e2e8fe015a649e546ea1c19c4 100644 (file)
--- 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 1dc0421201ec8c522effc68ad288f7982df4d61d..a18174797d657843325e4c1afe3cf93fe9b61d5f 100644 (file)
--- 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 9d4b14b087e6e19bf452f9495918c42b01512eff..82e494017a97c72a2813379b6bd741268e703303 100644 (file)
--- 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 3105b0b1b1fad49dc1548e55919fc19aed9dc8fc..aba57e5408f04c6dbf1faedafa1dd21ba4c5a947 100644 (file)
--- 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 8c2caa91409096b228287299fc7b068503adc5d5..e65a9c53f70ed46814ef9192765d793a9bf0209f 100644 (file)
--- 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 89724ddb8255f86b6f863921341af2c88badc30c..ee21b8467cfe01fdd416b2e656c0163bc9a2e72e 100644 (file)
--- 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 f416a65af00bf736065b4499655279819e465cdf..a07abf4a7d1886b5b7228306a92c9ef23d8e4511 100644 (file)
--- 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 e79e0d99da0b5a3245e93189bd36bf71ceea86d2..047296858c871444e65ba37b01de37e879475364 100644 (file)
--- 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 16daf15e90551f3b67f38a15c8329f367f374dd4..63140a7de840a3d3951328efce941694e0bd7d27 100644 (file)
--- 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 13f24e38b40a6bf0c72b144ab197d7c30f7e714b..22c7b2bc1ec907476471b37fca02a76631a77e2e 100644 (file)
--- 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 7403502fb487fbe2b9879a5ed1d358507f01ea3d..0eda16eb8a07510975a5e54e25612ae28e96ab42 100644 (file)
--- 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 af778e18c0a26892401eda7fa9848e5d3530a194..0cce5cd7e3972654249722f01b5eb23ad9d5c218 100644 (file)
--- 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 83c25f6d45fc9137a64224ec0362495c1eb8c555..1684c77717bf5c6d0f2ac134917975378b88bdc9 100644 (file)
--- 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 edcd9fd27f4badf002ce5a430f8fd1e20e7119de..695d97f3b2d54558eee6011a55e90b640755db24 100644 (file)
--- 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 b5c823f3433ce0d8729980a45cfb9437cfe60fb9..cbc500e076dcbc5da02bcb24510abba8ae4df628 100644 (file)
--- 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 7b7fce773edf6129b82ffe989ca624a5a6cec9a7..c2ce1c31b5dded146d7dfca31471ed4799b35081 100644 (file)
--- 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 4feceb6fb043992331c71c40de5290b8b1b76d7a..ac2b1f20dc028cdbea4ea7dc7cf177374ac0da01 100644 (file)
--- 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 8e96e9112481c283124587d915b4ecccbad1e4f1..db74a2c989f0fae3b1657257fc00da653686ed4f 100644 (file)
--- 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 504bdb6d0ec0f5e915d099d5029d7b492f32ea72..846d5d2b49e079f77dc28486c5efd5e5c1a3386d 100644 (file)
--- 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 0c81617b23291d7472a010b959534b02db3780e0..7e75d5d08946d8cdeb983fa133cc79b813c0a3b1 100644 (file)
--- 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 8d09f10e26459304590eec9d4b597e83396ec0cd..c990088218496c85bf7c5196e65ea93e8e491b85 100644 (file)
--- 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 4cb337f4b2a5f225c4fb7ece121e66f1f3a2829a..b4abea29d1b3180f1ebb40d216fcd532a77c965a 100644 (file)
--- 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 3be80eb3158e07cffba168bbfe5e91e887eefaf1..d73ae6126f21dbcf3223bf4cbe12a40d7a8cecf6 100644 (file)
--- 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 48ea40fee19a1909b9d986433eb8256ec082cf22..c00138ba1bbbd71d34ae66edacb6e4e023289865 100644 (file)
--- 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 3ff3b4c22d941d4d3fae509c831fd61bc59f341b..d7904de3006305efc6f304596acb997993c35baa 100644 (file)
--- 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 f99440a928685878246d2cda606a4e071a8cbdf8..ccff873a9eb948aadd314963dc626048a5f8fb6d 100644 (file)
--- 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 66fcbd929a3b8337e89c4f61da6c22a1e38d0c11..609a63a5f34b16586fd92473dbe637947d7ebc27 100644 (file)
--- 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 55d5ed0e08367023eb97f7bed4b818e102b23fe5..cc82f3a4b820909d7c876c4be3e0e0c17ba033b2 100644 (file)
--- 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 160e85a8cf3234513f08afa2661b0e66bbab67ed..6c39acfd5d81f6045492d6d591e2fce82c753b40 100644 (file)
--- 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 fa758b2f731e51ba93e9685842d8f35ec2a253e3..c5cd4486f2a010b1ddf36e3ecc7daee8ee50a0e0 100644 (file)
--- 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 914aee36da78fd8067838282c4e013235654fbc6..df7969348304064dab21346b63dae687cb892f17 100644 (file)
--- 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 28ba88ef8e00fa7508fe6ad72dbe39b924fc833f..a14c04b223bff13b864a8c6810388013687c2195 100644 (file)
--- 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 0c5e731fd60841aed6d466401e20fc157217b5cc..16721b588d2a1e2d05312c81585741bd2d76d07c 100644 (file)
--- 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 7d8076a17201f213fbc465e2bcebbf226945262f..d76c430e0f1cc8458a874f8568fdfb554bd14822 100644 (file)
--- 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 1a314cda7f88351d922bb03931f3f472c2c75ddc..f5982d00abb7b2be619a33936acf2561fdfbad7c 100644 (file)
--- 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 8a5fd398d6da6aed78206784d15a464a7e6d9490..343e546210281eb479ef90d58e2b2c1b64f8d9e8 100644 (file)
--- 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 87261060bab889e5edc4695aa3f5718c4e954346..8d76154987b1268db4b81722bda9ae478021e733 100644 (file)
--- 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 a8c3c01226b1c0fa208dfe7338800efa85fb6633..a4e3619be36545c351b2673d607fa4660416e927 100644 (file)
--- 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 415d423e90a6728cd25b0f10d35e3a5b95c16c7b..f9758b3fd6e03c9c0861689decc4095226f4f8a0 100644 (file)
--- 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 595ad784f8ca420c76988a36096dfd193015c93f..c9e48c84d1e107ecf4f683e85451e9c3b80103d8 100644 (file)
--- 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 ff46881c778507e1b0080b61fbcde24381873cf2..ccd828814c6be4e1bec97ce2e2d270ba4970b7b8 100644 (file)
--- 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 6211d52bafa04603190b8337a38b55dc81c68c05..d4118726f20675812029350785c933d544f86004 100644 (file)
--- 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 8f9d3765f9448872cdc82d7b62a1b38e35ae9a47..68491dcc525fb26cbd1ef945ed6ceffad9acb363 100644 (file)
--- 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 cdcafa9ec439c23ae7f72ccf3bb5a9360325930a..afabc7898f0c8756410ca882f630947536ee93d1 100644 (file)
--- 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 fb1626a3d79017b9059921b9211c829c50aa44e2..9786bd08fe4a4718ebf454afacf64aa197735e78 100644 (file)
--- 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 a80fa59e34d2190804364ce4d7e962e9946834b6..b4788867092d318cda0c8597b3c63b45e04f6bea 100644 (file)
--- 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 70c39057b55fd8c7be5eff44387802f9704027c7..abafb190f0755f6bc583b97cfe9e5a71dcbc23c8 100644 (file)
--- 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 d77e1f00ac8d435929169769581e298904455834..6589b5f2191761d2a8c385b37fa6a6c9b27d3fe2 100644 (file)
--- 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 4c7ac24a23a3818c0b7cb7b23ee31d265fdda6b3..1e1d25370aa2078fbd8f8f6dc8e1d83966ec9edf 100644 (file)
--- 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 77423847f040507b365592b319856a7567f65c76..ef615598785a4af1bdd140c01c179beba7bb7305 100644 (file)
--- 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 5162f037bf00814897b91618dac7afa91100e0af..db848c3392c8793024846140332a451081d39393 100644 (file)
--- 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 fe66329f9ca09e4930c4fe16ad70f7afd5ba4189..cb2464b3df2eecb0e0ddac533ad4e8ee13017cd6 100644 (file)
--- 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 35e124100b3136ce914385d8cfae6ef76b223bce..810258785ff07e5838681a96224d40186ad698cd 100644 (file)
--- 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 762c57e4e15aac155b1fa5f7184541882df6d67a..8c2b49915560c14ab3a10655a4de23d4fd401985 100644 (file)
--- 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 232213a4616bddea127e0fca943a6ae8ea11f178..fed6b92fd2d11ebbe7b95774b053907f0b7f7435 100644 (file)
--- 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 a90f7b535efa0c9b5e9fcc52e9bd1c43fb6ac832..ca16f9b6be94956e00c55e79703f8f648c9e9aaa 100644 (file)
--- 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 57ad559e423862a063eab74bf72aa4e4634bd441..5fd1236588600c26abd35a1f543e84bd6a534fca 100644 (file)
--- 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 878b09b38cab953e859f99e1031c4310145cc803..0d3f6a5ffc14bc13da16d10b267c436edb5c51bc 100644 (file)
--- 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 0414d7166496cff1410efec3b9a17a1a03338499..35e2fe3223f43f0b03eb0d7e03f9a56581afbdf7 100644 (file)
--- 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 78f408ded0e7596422d04b7ab9bd7ad104714cbd..82529a726fce96f6d849208e6893c9f068ef92b8 100644 (file)
--- 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<TunnelStateData *>(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<TunnelStateData> 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<TunnelStateData> 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 993b703c177d1bf81344679db07c0a613eaa0a50..f416c2c2a560e4013259ff6f5184eab4608878e5 100644 (file)
--- 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 78f84268df56d0ecfab15514f6d08a170132e57b..daed133f68389060fcedd09fc1b1bf72dc66373e 100644 (file)
--- 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 d1b718bc861e2b6f3745a4a658653c611bd4867e..ac7d25819a5a1998aeb744cc501ece203b91d660 100644 (file)
--- 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 e1e4059f7330d9e4ba4438d9892ddfb2ed6d2c35..1e0dc0c5c4b0b5a7767cf073a2776797fca568cf 100644 (file)
--- 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 1f121f88dbe206e7c8857833744a4eb1fba0bd33..45271c3b3a15354508a5d83862db2ce8d2c06257 100644 (file)
--- 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 894afce4b5de04ed8c2b8492502763984a7016df..44f40d9b7804cbb6557817cceba891b109571037 100644 (file)
--- 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 3e54f27befca2e8261c385dac1a23ba0c66f7a14..9bc4e0fad267de4c23a550688ee6ab154e18fd00 100644 (file)
--- 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 b13bc4a863614f5cddc0a5153447439dc57cf07f..b873c6890c4877ab4021e9374434ead0848aedcd 100644 (file)
--- 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 15208ad9857d2b5786dd9d57e879fbbe763676ec..ec24ad9e914f6164000df515d70155da82c42ce3 100644 (file)
--- 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 3b2723aac109c92969ddd454220c513da3f8b82f..81060813a6eb87d9c538db64ac6faa4a2da9cfc1 100644 (file)
--- 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 0eeb9ddd4319123c5068134afb2c15c5d9c099ff..09390144e33cdb0cc193108ae5cac9177a50a6a7 100644 (file)
--- 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<const wccp2_item_header_t*>(&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<const wccp2_item_header_t*>(&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<char*>(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<char*>(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 6986a3018a48080dc6594fb7ae10a9ddc2b25e66..d42eeca25b8e450436b067676171dbd570cefd89 100644 (file)
--- 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 eb2380fbf7256734c5dcf62bd413b9b24ae82685..8484ed493f4b6cc97b016c926d7622d9e31a41f8 100644 (file)
--- 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<WhoisState *>(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 8b1808a8a52a567442e1cc4964914b92a8cdb91f..1603e993a90eab698e196cdacce721a8964dbe0b 100644 (file)
--- 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 e9e39747f9c068f2b1cd7467dcc38702a29be25b..42823bf8c6aecb210fa290103572f008528ca024 100644 (file)
--- 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 4e9b3439003d3a5bf70ef37cc5ccd83c214bcaad..58d2137f003f4994d1309333b0384b9ea735fc5d 100644 (file)
--- 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 c75eee75ceb8f93985ab593c1a3e0da06328e15d..fa2292bc8d537efca218c788257a6ba51e8059bb 100644 (file)
--- 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 6f9365516125b8ce4c9cfed7f8e5f8a79f30120f..a2e6a7d85cda7e6572185abc2b0e9ffb3a250c39 100644 (file)
--- 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 08a22262f5323506633740cd974f49d055631b0c..a1b278ef9646d3be20e0d430bb3dd6223d08b649 100755 (executable)
--- 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 8c9edd86d2bebbb85835d7a37a06faaf77822cad..5a79808866e6d4db4ca6f60add447f51c7cb8fb6 100644 (file)
--- 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 75b86a7c9ed4ac143a5d042227ffa31894d77ed8..e0735b0a3bb1fc217794893376298d6b4bf449b5 100644 (file)
--- 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 e062c342a4fc8de586c87d71bce991ca38b941b3..6f28b3b597637ce56947b04252d569d5dda10f94 100644 (file)
--- 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 45af992df7e6314f8acf536b52236aef52e7051a..9eb3fddedaf16a6ef3f5904c6646491d01d60e82 100755 (executable)
--- 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 343e37c1cbeeff9af3ef5670ff5af6930bf155ef..4e065bbbc12ecd7ee2fbd46a0602e7ad51750d4d 100755 (executable)
--- 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 c344dab21a0e9b8e6f2e18ffde33fdcb58b1a21c..5e576c0d22dae9907a8eecff02b68a6ec88296a1 100644 (file)
--- 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 26d30d8ee81a26203e9f7a496367b3999ede968d..a52c12abd035c0810b9e57a1bd72b7cc82dc92fa 100644 (file)
--- 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 bc9c33b133f217ae42c8214a63bf38b1621d55e5..fef7d884a8b43f2f6a9e75b226752769b12801d5 100644 (file)
--- 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 87d957bbed8dbf276ef9312dec384f129f9999ee..e70ad03029bf225247e1c1ef4d0e964c2ad74701 100644 (file)
--- 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 ec684d04ae3b358ea11071b79f525cc72373f843..2a8cb5a2360d604f481265e6c33b32a86456751d 100644 (file)
--- 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 495ba8d42ce416b58611d1f110f1c33f6bbf6194..d1c792bc84076271cb42930106ce10e116194c7a 100644 (file)
--- 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 b0a831af3cffd4bf6de6db38d897f33615447423..1c634c46dc9e2751da3019b45732c983b1a2d14d 100644 (file)
--- 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 a8476492506a677e3f20d2d23f99cc2fdbee4cbd..44435ed9ee6727fbaf9477ee768ea0516b685c5f 100644 (file)
--- 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 2f867220c3c46803de6f31ba390b5d1e6149c15d..4c1a4c8a72c68d73e3c9ddbd76b6199d75ecf48b 100755 (executable)
--- 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 5a627487eca27cc37c00fb23f3ea00f379416f1b..f5934f4fbce4cdf8e73ccfc8a3cb3dccbc147ab6 100644 (file)
--- 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 cd3ecf7225a9730e737e255525b81be4194c92a0..919ac8dada51c66be0087ee787084b5bec547d34 100644 (file)
--- 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 6da5fe38741d4d6235d817b6c41ebf920eb40282..3833008203066105e587baa708a959a2fa185be0 100755 (executable)
--- 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 f9dff1a723b7468b927700fd14084ee6f1b4856c..d2864b21b27fe7ea62b3eac7b74fdfc1d1e2af1c 100755 (executable)
--- 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 2f2b735939b8aa60a06826ba111a4e62b6ba758b..f45eca398ef2619c0c3e40799c6ce92c8cb53413 100644 (file)
--- 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 0f391d8d3979434c7d01044d54fcf3175e19b17c..a0c23163457d50049eb2fff73a03b6d26584d9ea 100755 (executable)
--- 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 ca9e1ad0de241d65efb1842597630087a49d2066..5f3316955a8c40a154a264c76f91386ed6c47124 100755 (executable)
--- 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 2c9ae8c0c4578435934d07e26065f68fbc4c57e7..81ded31f9f09de3136aa1df6f9a7087994e04dc3 100644 (file)
--- 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 a51b4e50084881222bf404d25416b58a5b18a6a2..8796793cf6fcc33f63e14e0a3cd9309c4f6e8013 100644 (file)
--- 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 99dbeef02ca703c6a2a4a822bcb233dcc4e1d24d..b9e42e33bccdbce2c0168906d705a9efdab564cd 100644 (file)
--- 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 a40426cb5b2a630b36255051b4e61aca7f13211a..95c82a8d16413c24e3c5d5147e55efeaf5f42ef2 100644 (file)
--- 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 791d2f5917437c20f095bf535cbc8f601e4fd8b7..f4c3da232b61f66d088c6eb4af8ef54f4fde652a 100644 (file)
--- 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 41a441bd959c6fae6192f44bd820770d0bb28115..853a8488c9671dcc87bc07015b2038c9da8550fa 100644 (file)
--- 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 fcc9650a60f888541d87000bd4d46793407b23ab..5ef929cce9ef0a7584b58c43864bbe0a4f4a47fa 100644 (file)
--- 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 38cf588e08e3ab7b1e07514e9923691a2f22a761..2aafa81d4bcb09a6590a8bb6236d3610c6cb54c9 100644 (file)
--- 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 c97d9b75286b35ad981884545976ddcc49d47626..55cc4e68f8b0c8189b599e29a563541d0184feda 100644 (file)
--- 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 578ea135a2bd79bc06fdabdd185d592b13757f6d..16119fde04c064a9c6a7ea0ea87b02539cb597a1 100644 (file)
--- 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 965d6e51d09b0c027585fc01168c6a086de6269c..2cc6a2d6a500d0219f6cd196f80b3e022c9a1c1a 100644 (file)
--- 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 43bf3b5a17481c0db5061ad9e4c4f6d123c273e2..e8ae55d0f32f7d555c9330c6e3a1218dc38f898c 100644 (file)
--- 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 76ddfaff41775e1ddc0715b90619a3ec5b539484..de1075e01b41104ae36b672bab18749e3ba110ba 100644 (file)
--- 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 db993fffc5b6459686c21ca4c41970d838eb993b..b25a1727e47bbe55f111b07bbbb95016c18828f4 100755 (executable)
--- 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 edeb9c978b9303091b6c0ffefbd12956af933027..a4668d8dbab161a975f547fecd5269f1d17087cc 100644 (file)
--- 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 f1511417bc4f196266552f3f631fa890609e0dae..4ee6199d6dc6ebd803d47a494824fa09fcbc699d 100644 (file)
--- 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 6135ca8ab51af4aa99643d40e1ce187785df318f..82d36e02af209f2bf7760c74c4a87d941d00699e 100644 (file)
--- 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 6b6186e73ad4370b6625155958c2c7725af2b0d2..904eb53d478d92c95a0cf95b8510b1396cd50c48 100644 (file)
--- 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 8cc5ff628287dd184529e1b81eb7010fedc1fb95..b59dfa6447e28680f3adcabdadee3843aef39154 100644 (file)
--- 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 6605aaf8e62cf3705c6de775ecdfd9c2ae5989ec..5fbbd92cb25c46ed0fd409719d79f54a34e73512 100644 (file)
--- 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 5bdbecc9be25e32b723e195f7d7cd29d8bb59b5d..b9c772427b6f223a11c9d6b07ff26b41eb4e4a5d 100644 (file)
--- 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 ec075ddcd92a29d347d29bf0ff96db378b2302a9..c78fce9b1b1539546bece258b6459c7913693451 100644 (file)
--- 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 eca5418cb3ee7efc08fa0af13c1efabc5e00160f..be432e8fea56e01d75e374ddfdfe670eedfbcbab 100755 (executable)
--- 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 eb8bad94802b0b730abc907aafe4831dbe01a19e..888012b444314cb92ab85672dd5435706c740e9b 100755 (executable)
--- 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 dbaebd46c877b8e8a815bf7a3ee2f9497cf03be5..5016e78f2097129118b83ed2f98cc7c3f621d545 100755 (executable)
--- 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 f1909eb23f86186efa7bb15f474515ad7cff4a1f..fe4459320a3731e1428e9f567d5bc37d970802bc 100644 (file)
--- 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 ebf4e919b7262d5f9f11497a3c0062a8e65b8cbb..25e5626214650890ecbc85d4f7b46dc87428e311 100644 (file)
--- 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 82f151e79f5ea27a75c276fafda3b3a3d2fd9876..a467ceb2b5476416f228460d55b680be2c513c12 100644 (file)
--- 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 74512849d676a3c1a915095dc1e8e3eb5eb9b348..e57451a58304cce573e7935b8b46a8a36b1b46a4 100644 (file)
--- 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 f7e4466572f0245efbe1f1739e4f0297d93e57e5..c7691e688ea7a4e3f8cac45751541c46c9d620de 100644 (file)
--- 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 aebe77cfa4515151190403b5004357f1588d1d46..7a16326d43aef8e1eeb37c402149762390122d09 100644 (file)
--- 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 87a11850e2f5e8ad1cb6dc44bf91068c1fd9256a..5898b6a1734bfef843a450098973490bb56a4418 100644 (file)
--- 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 202d35d3aa21a9f5eec36c52976185f4e52136c0..2a8585ed1f3fdf57e24a7cba4c5441b3beba769d 100644 (file)
--- 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 ae293a75aa2b80a4adefd387850554c8dfe031cd..5a37f0dc59d9a9c67555487819f989821af9b81e 100644 (file)
--- 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 657efd15c179d632227581536366a5276e237077..d9ec661ace6855c5d50ce5c5de6e6e1404a6b785 100644 (file)
--- 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 051f8c9c57185e01236e0b3d32af0114d0afd338..7b99047c4dadc43a22a14e7dbf79925610d6b6e4 100644 (file)
--- 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 f3e2279ba3a5b6d0898fe55f52f79a05208b2335..19abd0f4fef263b994093ac2b4fbe2578c760793 100644 (file)
--- 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 15526b3925be04d3f39399f863f11e726fc38543..0923c5e1694585661ab470b6de3a59b2a080b544 100644 (file)
--- 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 c2b1b65ac8652fded7c4a67b7994b613bf8fb460..22ecafa05e898a36d34fbcb84efa8c2383d2f731 100644 (file)
--- 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 84df518c2bf8537ccae0c4b7ed0a3d4650bd2e0c..a1065ee2a4dc65a0993b8ec1f09a7744110ed0d9 100644 (file)
--- 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 e5f50a096a2635395b3771151bdb81af0532988c..575bee62f6609b2964501c5e633cc4e90066e8e1 100644 (file)
--- 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 65205bd03e33f5bc11de02ef14d86a8c83d3f278..2cdef47e6b901334e48f6abb710c0f67fafeafc1 100644 (file)
--- 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 3a019002009a5ede6420dd6ad57bb8295e2fdde1..23037ffeed2481e01c82f140d6d22e8a4b27d414 100644 (file)
--- 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 64b73e50ebd260620e7e048a2c56f06b65a2dd71..ac06a9be06571c2189174b34370f83fa076ea779 100644 (file)
--- 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 4bc7a9f4fe871129053fc6611ac80d228feeb308..3ac08268636cabc6cb9ffad7f052f660961e58f1 100644 (file)
--- 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 1f529701c5cdaedc150e19ffb5aafd91e40af0d8..b83ed7f20d991b18a93d21bc4b11cbf01b48df8b 100644 (file)
--- 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 a2033f1792edc3ed709fc0fe67af50a1034e584f..d9d29ceee2a585c1e7b37e1198129e83c6e221d6 100644 (file)
--- 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 de03256941389d867d66a52a443cb0b2134fec30..cc8f20450c9e402a3b5e45ea3600a123b438d2a1 100644 (file)
--- 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 df6ecbefa019dd9339dd0a2c35f4daeb34a15070..8db217916dc65216791ee6474cdb3e73489f050b 100644 (file)
--- 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 2aac75a667070bf84f2abce1075264e1dd9b7182..1eb6568f4c41a1cc719ceff9692d061dabade552 100644 (file)
--- 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 6df36d351ffb6eca0731f47edb1b8aa9043d0538..07d07c191655612893b58948295495af0509f174 100644 (file)
--- 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 34f7288c1aad014e03fe3287f3922c05f59d2e6d..467a6407270edcf61fe92271f164781e353a5cb8 100644 (file)
--- 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 9b7f80cb8577c5de8412195477cefcb9d80cc915..f3a2491f65e35774790b104ea37cab0e7b9a2b01 100644 (file)
--- 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 59ab59becddfea85923ccf29811df5539d04929c..71905f04baabde259045c234bc02d94d85623287 100644 (file)
--- 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.