From: Source Maintenance Date: Wed, 23 Dec 2015 12:12:10 +0000 (+0000) Subject: SourceFormat Enforcement X-Git-Tag: SQUID_4_0_4~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b307ad46bca0ca1cd1e1923bd451ed02aa7474a;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/comm/Connection.cc b/src/comm/Connection.cc index e098feb8b6..70a5760cdc 100644 --- a/src/comm/Connection.cc +++ b/src/comm/Connection.cc @@ -13,9 +13,9 @@ #include "comm/Connection.h" #include "fde.h" #include "neighbors.h" +#include "security/NegotiationHistory.h" #include "SquidConfig.h" #include "SquidTime.h" -#include "security/NegotiationHistory.h" class CachePeer; bool diff --git a/src/format/Format.cc b/src/format/Format.cc index 2639db1cc2..411b063ee8 100644 --- a/src/format/Format.cc +++ b/src/format/Format.cc @@ -20,11 +20,11 @@ #include "HttpRequest.h" #include "MemBuf.h" #include "rfc1738.h" +#include "security/NegotiationHistory.h" #include "SquidTime.h" #include "Store.h" #include "tools.h" #include "URL.h" -#include "security/NegotiationHistory.h" #if USE_OPENSSL #include "ssl/ErrorDetail.h" #include "ssl/ServerBump.h" diff --git a/src/security/NegotiationHistory.cc b/src/security/NegotiationHistory.cc index 34104c64f9..1e998be0cf 100644 --- a/src/security/NegotiationHistory.cc +++ b/src/security/NegotiationHistory.cc @@ -83,3 +83,4 @@ Security::NegotiationHistory::cipherName() const return nullptr; #endif } + diff --git a/src/ssl/bio.cc b/src/ssl/bio.cc index 9e4e49c650..67e22d6bf9 100644 --- a/src/ssl/bio.cc +++ b/src/ssl/bio.cc @@ -502,7 +502,7 @@ Ssl::ServerBio::flush(BIO *table) } } -void +void Ssl::ServerBio::extractHelloFeatures() { if (!receivedHelloFeatures_.initialized_)