------------------------------------------------------------ revno: 14030 revision-id: chtsanti@users.sourceforge.net-20160418152815-kvxyig2ogqv0iy11 parent: squid3@treenet.co.nz-20160417111927-2zyb8ptbicp13rjd committer: Christos Tsantilas branch nick: 3.5 timestamp: Mon 2016-04-18 18:28:15 +0300 message: Handshake Error: ccs received early: fix typo ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chtsanti@users.sourceforge.net-20160418152815-\ # kvxyig2ogqv0iy11 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: b1624d197dfc3a7f15d0ca810e484b20f8ec4489 # timestamp: 2016-04-18 15:50:55 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20160417111927-\ # 2zyb8ptbicp13rjd # # Begin patch === modified file 'src/ssl/bio.cc' --- src/ssl/bio.cc 2016-04-17 10:43:27 +0000 +++ src/ssl/bio.cc 2016-04-18 15:28:15 +0000 @@ -515,7 +515,7 @@ return clientFeatures.sessionId == serverFeatures.sessionId; // is this a session resuming attempt using TLS tickets? - if (clientFeatures.hasTlsTicket && receivedHelloFeatures_.hasCcsOrNst) + if (clientFeatures.hasTlsTicket && serverFeatures.hasCcsOrNst) return true; return false;