From: squidadm@squid-cache.org <>
Date: Fri, 7 Nov 2014 12:11:21 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: merge-candidate-3-v1~505
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e74be5fdcfd1710ba75dd6aaf056f0b06b188eb2;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index d54cef5f71..63ed1fedfd 100644
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -14,8 +14,8 @@
 #include "comm/Connection.h"
 #include "HierarchyLogEntry.h"
 #include "http/ProtocolVersion.h"
-#include "HttpHeader.h"
 #include "http/RequestMethod.h"
+#include "HttpHeader.h"
 #include "icp_opcode.h"
 #include "ip/Address.h"
 #include "LogTags.h"
diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index aea6f01308..abd37013b9 100644
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -13,8 +13,8 @@
 #include "Debug.h"
 #include "err_type.h"
 #include "HierarchyLogEntry.h"
-#include "HttpMsg.h"
 #include "http/RequestMethod.h"
+#include "HttpMsg.h"
 #include "Notes.h"
 #include "RequestFlags.h"
 #include "URL.h"
diff --git a/src/client_side.h b/src/client_side.h
index 5a644c9cb8..590d8dec18 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -14,8 +14,8 @@
 #include "clientStreamForward.h"
 #include "comm.h"
 #include "helper/forward.h"
-#include "HttpControlMsg.h"
 #include "http/forward.h"
+#include "HttpControlMsg.h"
 #include "ipc/FdNotes.h"
 #include "SBuf.h"
 #if USE_AUTH
diff --git a/src/htcp.h b/src/htcp.h
index 08e65aef56..31d109542b 100644
--- a/src/htcp.h
+++ b/src/htcp.h
@@ -11,8 +11,8 @@
 
 #if USE_HTCP
 
-#include "HttpHeader.h"
 #include "http/forward.h"
+#include "HttpHeader.h"
 #include "ip/forward.h"
 
 /// \ingroup ServerProtocolHTCP
diff --git a/src/servers/HttpServer.cc b/src/servers/HttpServer.cc
index cf2d437666..37e3c62aa8 100644
--- a/src/servers/HttpServer.cc
+++ b/src/servers/HttpServer.cc
@@ -12,8 +12,8 @@
 #include "client_side.h"
 #include "client_side_request.h"
 #include "comm/Write.h"
-#include "HttpHeaderTools.h"
 #include "http/one/RequestParser.h"
+#include "HttpHeaderTools.h"
 #include "profiler/Profiler.h"
 #include "servers/forward.h"
 #include "SquidConfig.h"
diff --git a/src/tests/testHttp1Parser.cc b/src/tests/testHttp1Parser.cc
index 7bfff5ec03..fc6e983453 100644
--- a/src/tests/testHttp1Parser.cc
+++ b/src/tests/testHttp1Parser.cc
@@ -13,13 +13,13 @@
 #define private public
 #define protected public
 
-#include "testHttp1Parser.h"
 #include "http/one/RequestParser.h"
 #include "http/RequestMethod.h"
 #include "Mem.h"
 #include "MemBuf.h"
 #include "SquidConfig.h"
 #include "testHttp1Parser.h"
+#include "testHttp1Parser.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttp1Parser );