From 63ed43c5e8b0477977f6598ff426295a2bc0e762 Mon Sep 17 00:00:00 2001
From: squidadm <squidadm@users.noreply.github.com>
Date: Fri, 12 Apr 2019 06:10:25 +0000
Subject: [PATCH] SourceFormat Enforcement (#391)

---
 src/ConfigParser.h          | 2 +-
 src/FwdState.cc             | 6 +++---
 src/clients/HttpTunneler.cc | 2 +-
 src/http.cc                 | 4 ++--
 src/log/forward.h           | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/ConfigParser.h b/src/ConfigParser.h
index 1212bce5f2..1f958da9c4 100644
--- 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 9c4a5cb214..774b14e690 100644
--- 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 fb0c8d336f..f8e7f8836d 100644
--- 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 5f462ad80f..9edfa7eb75 100644
--- 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 9c19ba08f0..8077b4df10 100644
--- 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.
-- 
2.39.2