SourceFormat Enforcement (#391)

diff --git a/src/ConfigParser.h b/src/ConfigParser.h
index 1212bce5f299740a939adcdf706cdd9ca0f7f135..1f958da9c4fdd4848c7b31e1e57e400e6eb148a5 100644 (file)
--- a/src/ConfigParser.h
+++ b/src/ConfigParser.h
@@ -9,8 +9,8 @@
 #ifndef SQUID_CONFIGPARSER_H
 #define SQUID_CONFIGPARSER_H
 
-#include "SquidString.h"
 #include "sbuf/forward.h"
+#include "SquidString.h"
 
 #include <queue>
 #include <stack>

diff --git a/src/FwdState.cc b/src/FwdState.cc
index 9c4a5cb214b18eef0a38d31b27d777f7a9d7de7f..774b14e690ed104fda02c6c08b3d5f05461c3193 100644 (file)
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -972,9 +972,9 @@ FwdState::connectStart()
     // recognize step1 bumping by nil ConnStateData::serverBump().
 #if USE_OPENSSL
     const auto clientFirstBump = request->clientConnectionManager.valid() &&
-        (request->clientConnectionManager->sslBumpMode == Ssl::bumpClientFirst ||
-         (request->clientConnectionManager->sslBumpMode == Ssl::bumpBump && !request->clientConnectionManager->serverBump())
-            );
+                                 (request->clientConnectionManager->sslBumpMode == Ssl::bumpClientFirst ||
+                                  (request->clientConnectionManager->sslBumpMode == Ssl::bumpBump && !request->clientConnectionManager->serverBump())
+                                 );
 #else
     const auto clientFirstBump = false;
 #endif /* USE_OPENSSL */

diff --git a/src/clients/HttpTunneler.cc b/src/clients/HttpTunneler.cc
index fb0c8d336f51a4905236c9e4ba6ba93a73be668b..f8e7f8836df4b420e547ba209b5a70f17a5dbdcd 100644 (file)
--- a/src/clients/HttpTunneler.cc
+++ b/src/clients/HttpTunneler.cc
@@ -18,8 +18,8 @@
 #include "http/one/ResponseParser.h"
 #include "http/StateFlags.h"
 #include "HttpRequest.h"
-#include "StatCounters.h"
 #include "SquidConfig.h"
+#include "StatCounters.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Http, Tunneler);
 

diff --git a/src/http.cc b/src/http.cc
index 5f462ad80f654698de187bb27c6e9a7b59230f5b..9edfa7eb751d1ab441b8665ec78d3b5efd34555e 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1687,8 +1687,8 @@ httpFixupAuthentication(HttpRequest * request, const HttpHeader * hdr_in, HttpHe
     // statement forwards a "basic" Proxy-Authorization value from our client
     // to an originserver peer. Other PROXYPASS cases are handled lower.
     if (flags.toOrigin &&
-        strcmp(request->peer_login, "PROXYPASS") == 0 &&
-        hdr_in->has(Http::HdrType::PROXY_AUTHORIZATION)) {
+            strcmp(request->peer_login, "PROXYPASS") == 0 &&
+            hdr_in->has(Http::HdrType::PROXY_AUTHORIZATION)) {
 
         const char *auth = hdr_in->getStr(Http::HdrType::PROXY_AUTHORIZATION);
 

diff --git a/src/log/forward.h b/src/log/forward.h
index 9c19ba08f0c5be17040c8ad920042b69d03e8bd2..8077b4df1093f912dca9872fa5d164b4d7c1c7ca 100644 (file)
--- a/src/log/forward.h
+++ b/src/log/forward.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2019 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.