From: squidadm <squidadm@users.noreply.github.com>
Date: Tue, 6 Sep 2022 02:59:32 +0000 (+0000)
Subject: Source Format Enforcement (#1132)
X-Git-Tag: SQUID_6_0_1~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=882010a8e2953ddf4906b4f68079b54586102ad6;p=thirdparty%2Fsquid.git

Source Format Enforcement (#1132)
---

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b770ef71ba..d70fed3c5a 100644
--- 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 212cf239e8..cdcfefd8f1 100644
--- 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 baa10dfb36..c1fbcd0160 100644
--- 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 17bec9b1eb..bbd65098da 100644
--- 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.