From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Tue, 26 Aug 2014 09:01:27 +0000 (+0300)
Subject: merge from trunk
X-Git-Tag: SQUID_3_5_0_1~89^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6649f6c62f90053f0bf0f162918a94f1d763b3d;p=thirdparty%2Fsquid.git

merge from trunk
---

c6649f6c62f90053f0bf0f162918a94f1d763b3d
diff --cc src/client_side.h
index c1772b30ca,45f257b961..b489ccbf88
--- a/src/client_side.h
+++ b/src/client_side.h
@@@ -341,14 -349,9 +349,17 @@@ public
      void stopPinnedConnectionMonitoring();
  
  #if USE_OPENSSL
+     /// the second part of old httpsAccept, waiting for future HttpsServer home
+     void postHttpsAccept();
+ 
 +    /// Initializes and starts a peek-and-splice negotiation with the SSL client
 +    void startPeekAndSplice();
 +    /// Called when the initialization of peek-and-splice negotiation finidhed
 +    void startPeekAndSpliceDone();
 +    /// Called when a peek-and-splice step finished. For example after
 +    /// server-side SSL certificates received and client-side SSL certificates
 +    /// generated
 +    void doPeekAndSpliceStep();
      /// called by FwdState when it is done bumping the server
      void httpsPeeked(Comm::ConnectionPointer serverConnection);