Source Format Enforcement (#1132)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b770ef71ba5daeec4aeacc9cbfc30ef4f212b74a..d70fed3c5a831543e3a1dff3b5af0c12815ea969 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -397,6 +397,7 @@ Thank you!
     Pierre LALET <pierre.lalet@cea.fr>
     Pierre-Louis Brenac <brenacp@esiee.fr>
     Poul-Henning Kamp <phk@login.dknet.dk>
+    pponakan <52429302+pponakan@users.noreply.github.com>
     Priyanka Gupta <priyanka@icelero.com>
     Przemek Czerkas <pczerkas@mgmnet.pl>
     Quentin THEURET <quentin.theuret@gmail.com>
@@ -431,6 +432,7 @@ Thank you!
     Rodrigo Campos <rodrigo@geekbunker.org>
     Rodrigo Rubira Branco <rodrigo@kernelhacking.com>
     Rodrigo Rubira Branco <rrbranco@br.ibm.com>
+    Roie Rachamim <roierachamim@gmail.com>
     Ron Gomes <rrg@ny.ubs.com>
     Rosen Penev <rosenp@gmail.com>
     Russell Street <r.street@auckland.ac.nz>

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index 212cf239e88225ac3145ca01cd5f1cbc40dd166d..cdcfefd8f149af6f3b4190614adfc481259b185d 100644 (file)
--- a/doc/debug-sections.txt
+++ b/doc/debug-sections.txt
@@ -62,7 +62,6 @@ section 24    SBuf
 section 25    MIME Parsing and Internal Icons
 section 25    MiME Header Parsing
 section 26    Secure Sockets Layer Proxy
-section 27    Cache Announcer
 section 28    Access Control
 section 29    Authenticator
 section 29    NTLM Authenticator

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index baa10dfb36f106583dbff92ffa7242d06a500909..c1fbcd0160dfbe8117b1eb12cb436ea3835d3a1c 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -76,17 +76,18 @@ static HttpHeaderMask ReplyHeadersMask;     /* set run-time using ReplyHeaders *
 /* header accounting */
 // NP: keep in sync with enum http_hdr_owner_type
 static std::array<HttpHeaderStat, hoEnd> HttpHeaderStats = {{
-    HttpHeaderStat(/*hoNone*/ "all", nullptr),
+        HttpHeaderStat(/*hoNone*/ "all", nullptr),
 #if USE_HTCP
-    HttpHeaderStat(/*hoHtcpReply*/ "HTCP reply", &ReplyHeadersMask),
+        HttpHeaderStat(/*hoHtcpReply*/ "HTCP reply", &ReplyHeadersMask),
 #endif
-    HttpHeaderStat(/*hoRequest*/ "request", &RequestHeadersMask),
-    HttpHeaderStat(/*hoReply*/ "reply", &ReplyHeadersMask)
+        HttpHeaderStat(/*hoRequest*/ "request", &RequestHeadersMask),
+        HttpHeaderStat(/*hoReply*/ "reply", &ReplyHeadersMask)
 #if USE_OPENSSL
-    , HttpHeaderStat(/*hoErrorDetail*/ "error detail templates", nullptr)
+        , HttpHeaderStat(/*hoErrorDetail*/ "error detail templates", nullptr)
 #endif
-    /* hoEnd */
-}};
+        /* hoEnd */
+    }
+};
 
 static int HeaderEntryParsedCount = 0;
 

diff --git a/test-suite/squidconf/empty.conf b/test-suite/squidconf/empty.conf
index 17bec9b1eb03c952bcac891b8662f0edc48bd758..bbd65098da3176af9b0a4b82f8fe787615365fc7 100644 (file)
--- a/test-suite/squidconf/empty.conf
+++ b/test-suite/squidconf/empty.conf
@@ -1,4 +1,4 @@
-## Copyright (C) 1996-2017 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2022 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.