From: Source Maintenance Date: Tue, 5 May 2015 12:12:14 +0000 (+0000) Subject: SourceFormat Enforcement X-Git-Tag: merge-candidate-3-v1~138 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fe542fee92fe133ca89cb2a1c7e7487db88403c;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index 221fe4d768..8bcb2dd40a 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -83,7 +83,6 @@ Adaptation::Icap::ServiceRep::finalize() sslContext = writeableCfg().secure.createContext(true); } - theSessionFailures.configure(TheConfig.oldest_service_failure > 0 ? TheConfig.oldest_service_failure : -1); } diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc index 215fbaba0f..8449d17bca 100644 --- a/src/adaptation/icap/Xaction.cc +++ b/src/adaptation/icap/Xaction.cc @@ -22,8 +22,8 @@ #include "CommCalls.h" #include "err_detail_type.h" #include "fde.h" -#include "globals.h" #include "FwdState.h" +#include "globals.h" #include "HttpMsg.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/ssl/PeerConnector.cc b/src/ssl/PeerConnector.cc index 336076ed3c..64ef12335b 100644 --- a/src/ssl/PeerConnector.cc +++ b/src/ssl/PeerConnector.cc @@ -832,3 +832,4 @@ Ssl::PeekingPeerConnector::handleServerCertificate() } } } +