From 2833a25fde8622cbd51266bb00310ee7d653ccfa Mon Sep 17 00:00:00 2001 From: Christos Tsantilas Date: Fri, 1 Aug 2014 19:03:37 +0300 Subject: [PATCH] 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 --- src/client_side.cc | 2 +- src/ssl/bio.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client_side.cc b/src/client_side.cc index b49e921cd8..9d8c3bbe07 100644 --- 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 b6d2fe9972..fb90cd91e6 100644 --- 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 -- 2.47.2