From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 25 Apr 2014 10:47:59 +0000 (-0700)
Subject: Fix bugs in rev.13379
X-Git-Tag: SQUID_3_5_0_1~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d121e63c37f46dbb4ba8bc671199ce2dc896c088;p=thirdparty%2Fsquid.git

Fix bugs in rev.13379
---

diff --git a/src/carp.cc b/src/carp.cc
index 7e38996775..3c1c65a3c7 100644
--- a/src/carp.cc
+++ b/src/carp.cc
@@ -206,16 +206,16 @@ carpSelectParent(HttpRequest * request)
                 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