merge from trunk

diff --cc acinclude/lib-checks.m4
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/FwdState.cc
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side.h
index c1772b30ca05a6166c2ee216186a3d53c3efbd6e,45f257b961ae0527dffdf9a9d03187c562278532..b489ccbf88f29f9e5a003ad0cd6b4b0c975d91ce
--- 1/src/client_side.h
--- 2/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);
  

diff --cc src/format/Token.cc
Simple merge