From: Source Maintenance <squidadm@squid-cache.org>
Date: Wed, 18 May 2016 18:12:17 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_4_0_11~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=995365cd93f9914f666174c8d413caee52af7817;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/parser/BinaryTokenizer.cc b/src/parser/BinaryTokenizer.cc
index d9370678d5..6e47f21845 100644
--- a/src/parser/BinaryTokenizer.cc
+++ b/src/parser/BinaryTokenizer.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2016 The 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 61807b7683..649238d366 100644
--- a/src/parser/BinaryTokenizer.h
+++ b/src/parser/BinaryTokenizer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2016 The 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 c5c49a413f..36f9f6ba46 100644
--- a/src/security/Handshake.h
+++ b/src/security/Handshake.h
@@ -107,10 +107,10 @@ private:
     /// TLS record layer (parsing uninterpreted data)
     Parser::BinaryTokenizer tkRecords;
 
-     /// TLS message layer (parsing fragments)
+    /// TLS message layer (parsing fragments)
     Parser::BinaryTokenizer tkMessages;
 
-     /// Whether to use TLS parser or a V2 compatible parser
+    /// Whether to use TLS parser or a V2 compatible parser
     YesNoNone expectingModernRecords;
 };
 
diff --git a/src/security/NegotiationHistory.h b/src/security/NegotiationHistory.h
index 65e0490b7e..8e691123a7 100644
--- a/src/security/NegotiationHistory.h
+++ b/src/security/NegotiationHistory.h
@@ -10,8 +10,8 @@
 #define SQUID_SRC_SECURITY_NEGOTIATIONHISTORY_H
 
 #include "anyp/ProtocolVersion.h"
-#include "security/Session.h"
 #include "security/Handshake.h"
+#include "security/Session.h"
 
 namespace Security {