From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 15 Mar 2014 11:42:55 +0000 (-0700)
Subject: Polish up the diff
X-Git-Tag: SQUID_3_5_0_1~321^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73042f2e4935ab5323f6d96bc7760ca7371ea989;p=thirdparty%2Fsquid.git

Polish up the diff
---

diff --git a/src/CommCalls.h b/src/CommCalls.h
index 8d3a9bac11..93bbafe5e6 100644
--- a/src/CommCalls.h
+++ b/src/CommCalls.h
@@ -6,7 +6,6 @@
 #include "comm/forward.h"
 #include "comm_err_t.h"
 #include "MasterXaction.h"
-#include "SBuf.h"
 
 /* CommCalls implement AsyncCall interface for comm_* callbacks.
  * The classes cover two call dialer kinds:
@@ -107,6 +106,8 @@ public:
     bool syncWithComm(); // see CommCommonCbParams::syncWithComm
 };
 
+class SBuf;
+
 // read/write (I/O) parameters
 class CommIoCbParams: public CommCommonCbParams
 {
diff --git a/src/client_side.cc b/src/client_side.cc
index d4b4ddda0b..0fc2df8c3a 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3631,7 +3631,8 @@ httpsSslBumpAccessCheckDone(allow_t answer, void *data)
         bool ret = connState->handleReadData(&reqStr);
         if (ret)
             ret = connState->clientParseRequests();
-        else {
+
+        if (!ret) {
             debugs(33, 2, HERE << "Failed to start fake CONNECT request for ssl bumped connection: " << connState->clientConnection);
             connState->clientConnection->close();
         }
diff --git a/src/comm/IoCallback.h b/src/comm/IoCallback.h
index 5d50c09578..b2574795f5 100644
--- a/src/comm/IoCallback.h
+++ b/src/comm/IoCallback.h
@@ -4,9 +4,10 @@
 #include "base/AsyncCall.h"
 #include "comm/forward.h"
 #include "comm_err_t.h"
-#include "SBuf.h"
 #include "typedefs.h"
 
+class SBuf;
+
 namespace Comm
 {