[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squid-cvs
Subject:    /bzr/squid3/trunk/ r13380: Fix bugs in rev.13379
From:       Amos Jeffries <squid3 () treenet ! co ! nz>
Date:       2014-04-25 10:47:59
Message-ID: 20140425105009.90935.qmail () squid-cache ! org
[Download RAW message or body]

--===============0265266153==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------
revno: 13380
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
modified:
  src/carp.cc

--===============0265266153==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; name="r13380.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

=== modified file 'src/carp.cc'
--- a/src/carp.cc	2014-04-23 18:39:04 +0000
+++ b/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


--===============0265266153==--
[prev in list] [next in list] [prev in thread] [next in thread]