]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix bugs in rev.13379
authorAmos Jeffries <squid3@treenet.co.nz>
Fri, 25 Apr 2014 10:47:59 +0000 (03:47 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Fri, 25 Apr 2014 10:47:59 +0000 (03:47 -0700)
src/carp.cc

index 7e389967755bab3e745ba16e59e68207240759a7..3c1c65a3c77e308940ab414ec1e3a5ad875e2dea 100644 (file)
@@ -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