Peek and Splice: Bug fixes

 - Initialize Ssl::ServerBio::bumpMode_ member in constructor
 - While we are checking ssl_bump access list the Stare mode is never selected

diff --git a/src/client_side.cc b/src/client_side.cc
index b49e921cd8a8e293f5c219dbece408f3d2306c2a..9d8c3bbe07f1a4217de7c6751729b5e137a1ad5b 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -4054,7 +4054,7 @@ void httpsSslBumpStep2AccessCheckDone(allow_t answer, void *data)
         if (answer.kind == Ssl::bumpTerminate || answer.kind == Ssl::bumpErr)
             comm_close(connState->clientConnection->fd);
         else {
-            if (answer.kind != Ssl::bumpPeek || answer.kind == Ssl::bumpStare)
+            if (answer.kind != Ssl::bumpPeek && answer.kind != Ssl::bumpStare)
                 connState->sslBumpMode = Ssl::bumpBump;
             else
                 connState->sslBumpMode = (Ssl::BumpMode)answer.kind;

diff --git a/src/ssl/bio.h b/src/ssl/bio.h
index b6d2fe9972da896f05a9fff26024ff5570ca65de..fb90cd91e6bd12d356baa41664bbab7b3269c63a 100644 (file)
--- a/src/ssl/bio.h
+++ b/src/ssl/bio.h
@@ -115,7 +115,7 @@ private:
 /// BIO node to handle socket IO for squid server side
 class ServerBio: public Bio {
 public:
-    explicit ServerBio(const int anFd): Bio(anFd), featuresSet(false), helloMsgSize(0), helloBuild(false), allowSplice(false), allowBump(false), holdWrite_(false), record_(false) {}
+    explicit ServerBio(const int anFd): Bio(anFd), featuresSet(false), helloMsgSize(0), helloBuild(false), allowSplice(false), allowBump(false), holdWrite_(false), record_(false), bumpMode_(bumpNone) {}
     /// The ServerBio version of the Ssl::Bio::stateChanged method
     virtual void stateChanged(const SSL *ssl, int where, int ret);
     /// The ServerBio version of the Ssl::Bio::write method