merge from trunk-r14667

diff --cc src/client_side.cc
index 62e426ba9458f359879b14cd65f8e488e2ebd763,465ef9d52f3b30977dd3059623f3c465ca34d562..4c355dfc13a033006e784e6fada2ab588e1258bf
--- 1/src/client_side.cc
--- 2/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...
  

diff --cc src/client_side.h
Simple merge

diff --cc src/tunnel.cc
Simple merge