From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Fri, 13 May 2016 11:49:15 +0000 (+0300)
Subject: merge from trunk-r14667
X-Git-Tag: SQUID_4_0_11~29^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39f6946553d9da5d2ee174448b05b8603c57006a;p=thirdparty%2Fsquid.git

merge from trunk-r14667
---

39f6946553d9da5d2ee174448b05b8603c57006a
diff --cc src/client_side.cc
index 62e426ba94,465ef9d52f..4c355dfc13
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@@ -3277,8 -3269,10 +3277,7 @@@ ConnStateData::splice(
          // set the current protocol to something sensible (was "HTTPS" for the bumping process)
          // we are sending a faked-up HTTP/1.1 message wrapper, so go with that.
          transferProtocol = Http::ProtocolVersion();
--        // XXX: copy from MemBuf reallocates, not a regression since old code did too
-         fakeAConnectRequest("intercepted TLS spliced", inBuf);
 -        SBuf temp;
 -        temp.append(rbuf.content(), rbuf.contentSize());
 -        return fakeAConnectRequest("intercepted TLS spliced", temp);
++        return fakeAConnectRequest("intercepted TLS spliced", inBuf);
      } else {
          // XXX: assuming that there was an HTTP/1.1 CONNECT to begin with...