------------------------------------------------------------
revno: 13380
revision-id: squid3@treenet.co.nz-20140425104759-f2l151o3hr4g4t3r
parent: squid3@treenet.co.nz-20140423183904-52fw2cain2tfvekh
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Fri 2014-04-25 03:47:59 -0700
message:
  Fix bugs in rev.13379
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140425104759-f2l151o3hr4g4t3r
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 682274a542b45c685150f968a4a879deb734e080
# timestamp: 2014-04-25 10:54:10 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140423183904-\
#   52fw2cain2tfvekh
# 
# Begin patch
=== modified file 'src/carp.cc'
--- src/carp.cc	2014-04-23 18:39:04 +0000
+++ src/carp.cc	2014-04-25 10:47:59 +0000
@@ -206,16 +206,16 @@
                 key.append(portbuf);
             }
             if (tp->options.carp_key.path) {
-                SBuf::size_type pos;
-                if ((pos=request->urlpath.find('?'))!=SBuf::npos)
-                    key.append(request->urlpath.substr(0,pos));
+                String::size_type pos;
+                if ((pos=request->urlpath.find('?'))!=String::npos)
+                    key.append(SBuf(request->urlpath.substr(0,pos)));
                 else
-                    key.append(request->urlpath);
+                    key.append(SBuf(request->urlpath));
             }
             if (tp->options.carp_key.params) {
-                SBuf::size_type pos;
-                if ((pos=request->urlpath.find('?'))!=SBuf::npos)
-                    key.append(request->urlpath.substr(pos, request->urlpath.size()));
+                String::size_type pos;
+                if ((pos=request->urlpath.find('?'))!=String::npos)
+                    key.append(SBuf(request->urlpath.substr(pos,request->urlpath.size())));
             }
         }
         // if the url-based key is empty, e.g. because the user is