From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Tue, 12 Aug 2014 00:14:56 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_5_0_1~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8939f9c98cb2789ea1f7fa39894a88f478b65393;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index f07e5f908f..10bf67f633 100644
--- a/doc/debug-sections.txt
+++ b/doc/debug-sections.txt
@@ -67,6 +67,7 @@ section 30    Ident (RFC 931)
 section 31    Hypertext Caching Protocol
 section 32    Asynchronous Disk I/O
 section 33    Client-side Routines
+section 33    Transfer protocol servers
 section 35    FQDN Cache
 section 37    ICMP Routines
 section 38    Network Measurement Database
diff --git a/lib/profiler/xprof_type.h b/lib/profiler/xprof_type.h
index a7ba32a411..11f37db2a0 100644
--- a/lib/profiler/xprof_type.h
+++ b/lib/profiler/xprof_type.h
@@ -10,6 +10,7 @@ typedef enum {
     XPROF_HttpHeader_getCc,
     XPROF_HttpMsg_httpMsgParseStep,
     XPROF_HttpParserParseReqLine,
+    XPROF_HttpServer_parseOneRequest,
     XPROF_HttpStateData_processReplyBody,
     XPROF_HttpStateData_processReplyHeader,
     XPROF_HttpStateData_readReply,
@@ -60,7 +61,6 @@ typedef enum {
     XPROF_httpStart,
     XPROF_malloc,
     XPROF_mem_hdr_write,
-    XPROF_parseHttpRequest,
     XPROF_read,
     XPROF_realloc,
     XPROF_recv,
diff --git a/src/servers/FtpServer.h b/src/servers/FtpServer.h
index cdc5fa85af..0b30178e7b 100644
--- a/src/servers/FtpServer.h
+++ b/src/servers/FtpServer.h
@@ -5,8 +5,8 @@
 #ifndef SQUID_SERVERS_FTP_SERVER_H
 #define SQUID_SERVERS_FTP_SERVER_H
 
-#include "client_side.h"
 #include "base/Lock.h"
+#include "client_side.h"
 
 namespace Ftp
 {