[squid-dev] [PATCH] splicing resumed sessions

[Amos Jeffries]

On 11/04/2015 10:01 p.m., Tsantilas Christos wrote:
> Patch applied as r14012.
> I am attaching the t13 patch for squid-3.5 too.
> 

I've backported the server_name ACL patch before this one and your 3.5
patch does not seem to apply well on top of it.

However the regular backport method "bzr merge -r15011..14013 trunk"
seems to have only one minor collision.

I'm unsure its doing the right things though. Comparing your patch to
the changeset bzr merge produces I see these two odd chunks (in relation
to the server_name ACL changes):

--- christos.patch  2015-04-13 04:54:19.678645218 -0700
+++ bzr_merge.patch       2015-04-13 04:33:23.514618772 -0700
@@ -599,19 +598,15 @@
 +    return helloMsgSize;
 +}
 +
- bool
--Ssl::Bio::sslFeatures::get(const unsigned char *hello)
++bool
 +Ssl::Bio::sslFeatures::checkForCcsOrNst(const unsigned char *msg,
size_t size)
- {
--    // The SSL handshake message should starts with a 0x16 byte
--    if (hello[0] == 0x16) {
--        return parseV3Hello(hello);
++{
 +    while (size > 5) {
 +        const int msgType = msg[0];
 +        const int msgSslVersion = (msg[1] << 8) | msg[2];
 +        debugs(83, 7, "SSL Message Version :" << std::hex <<
std::setw(8) << std::setfill('0') << msgSslVersion);
 +        // Check for Change Cipher Spec message
-+        // RFC5246 section 6.2.1
++        // RFC5246 section 6.2.1
 +        if (msgType == 0x14) {// Change Cipher Spec message found
 +            debugs(83, 7, "SSL  Change Cipher Spec message found");
 +            return true;
@@ -636,9 +631,13 @@
 +    return false;
 +}
 +
-+bool
+ bool
+-Ssl::Bio::sslFeatures::get(const unsigned char *hello)
 +Ssl::Bio::sslFeatures::get(const MemBuf &buf, bool record)
-+{
+ {
+-    // The SSL handshake message should starts with a 0x16 byte
+-    if (hello[0] == 0x16) {
+-        return parseV3Hello(hello);
 +    int msgSize;
 +    if ((msgSize = parseMsgHead(buf)) <= 0) {
 +        debugs(83, 7, "Not a known SSL handshake message");


If you can try the bzr merge and confirm the diff/changeset is correct I
will do that normal cherrypicking backport.

Amos