From: Amos Jeffries Date: Mon, 2 Jun 2014 14:02:57 +0000 (-0700) Subject: Remove additional minor performance regression X-Git-Tag: merge-candidate-3-v1~506^2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63ccea280c11a4ef3e92a18aa433df61ae9fbfee;p=thirdparty%2Fsquid.git Remove additional minor performance regression --- diff --git a/src/client_side.cc b/src/client_side.cc index 71dfdded01..0be2c5c424 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -2074,7 +2074,7 @@ prepareAcceleratedURL(ConnStateData * conn, ClientHttpRequest *http, Http1::Requ return; /* already in good shape */ // XXX: re-use proper URL parser for this - SBuf url = hp.requestUri(); // save point if we abort. + SBuf url = hp.requestUri(); // use full provided URI if we abort do { // use a loop so we can break out of it ::Parser::Tokenizer tok(url); if (tok.remaining()[0] == '/') @@ -2098,14 +2098,14 @@ prepareAcceleratedURL(ConnStateData * conn, ClientHttpRequest *http, Http1::Requ if (!tok.skip(authority)) break; + static const SBuf slashUri("/"); SBuf t = tok.remaining(); if (t.isEmpty()) - url = SBuf("/"); + url = slashUri; else if (t[0]=='/') // looks like path url = t; else if (t[0]=='?' || t[0]=='#') { // looks like query or fragment. fix '/' - url.clear(); - url.append("/",1); + url = slashUri; url.append(t); } // else do nothing. invalid path