------------------------------------------------------------
revno: 13453
revision-id: chtsanti@users.sourceforge.net-20140606145254-flbpbr0sy86rxk3p
parent: chtsanti@users.sourceforge.net-20140606145104-mj35kdfkd8iqhpq9
committer: Christos Tsantilas <chtsanti@users.sourceforge.net>
branch nick: trunk
timestamp: Fri 2014-06-06 17:52:54 +0300
message:
  Fix error in rev.13447 "ssl_bump none" mode fixes.
  
  Fix to allow squid build when SSL is enabled
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chtsanti@users.sourceforge.net-20140606145254-\
#   flbpbr0sy86rxk3p
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 8ea943678f10c8f9d4bf7f3617d8a64cec4e108c
# timestamp: 2014-06-06 14:53:50 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: chtsanti@users.sourceforge.net-20140606145104-\
#   mj35kdfkd8iqhpq9
# 
# Begin patch
=== modified file 'src/client_side.cc'
--- src/client_side.cc	2014-06-06 10:45:26 +0000
+++ src/client_side.cc	2014-06-06 14:52:54 +0000
@@ -3627,7 +3627,8 @@
         static char ip[MAX_IPSTRLEN];
         connState->clientConnection->local.toUrl(ip, sizeof(ip));
         // Pre-pend this fake request to the TLS bits already in the buffer
-        SBuf retStr("CONNECT ").append(ip).append(" HTTP/1.1\r\nHost: ").append(ip).append("\r\n\r\n");
+        SBuf retStr;
+        retStr.append("CONNECT ").append(ip).append(" HTTP/1.1\r\nHost: ").append(ip).append("\r\n\r\n");
         connState->in.buf = retStr.append(connState->in.buf);
         bool ret = connState->handleReadData();
         if (ret)