------------------------------------------------------------
revno: 13620
revision-id: chtsanti@users.sourceforge.net-20141001124644-mg76l17zfojyy0ah
parent: chtsanti@users.sourceforge.net-20141001123158-m6e3c8t98q7l25jf
committer: Christos Tsantilas <chtsanti@users.sourceforge.net>
branch nick: trunk
timestamp: Wed 2014-10-01 15:46:44 +0300
message:
  Polish peek-and-splice related code part2
  
  - Record SSL bump action in Ssl::ServerBump::act at step3
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chtsanti@users.sourceforge.net-20141001124644-\
#   mg76l17zfojyy0ah
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 6345de3d67a154aaa4f12d2b8a24dee3941e786a
# timestamp: 2014-10-06 17:34:04 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk
# base_revision_id: chtsanti@users.sourceforge.net-20141001123158-\
#   m6e3c8t98q7l25jf
# 
# Begin patch
=== modified file 'src/ssl/PeerConnector.cc'
--- src/ssl/PeerConnector.cc	2014-10-01 12:31:58 +0000
+++ src/ssl/PeerConnector.cc	2014-10-01 12:46:44 +0000
@@ -331,8 +331,10 @@
         finalAction = Ssl::bumpSplice;
 
     // Record final decision
-    if (request->clientConnectionManager.valid())
+    if (request->clientConnectionManager.valid()) {
         request->clientConnectionManager->sslBumpMode = finalAction;
+        request->clientConnectionManager->serverBump()->act.step3 = finalAction;
+    }
 
     if (finalAction == Ssl::bumpTerminate) {
         comm_close(serverConn->fd);