------------------------------------------------------------ revno: 13405 revision-id: squidadm@squid-cache.org-20140509001430-ptlu3l7tgzc3dtkl parent: rousskov@measurement-factory.com-20140508224301-p70drxbqn1ls45i8 committer: Automatic source maintenance branch nick: trunk timestamp: Thu 2014-05-08 18:14:30 -0600 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20140509001430-\ # ptlu3l7tgzc3dtkl # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: f84721e6c5b9ce1d9244f1264329cc10fd9020ed # timestamp: 2014-05-09 00:53:52 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: rousskov@measurement-factory.com-20140508224301-\ # p70drxbqn1ls45i8 # # Begin patch === modified file 'src/redirect.cc' --- src/redirect.cc 2014-05-08 10:17:41 +0000 +++ src/redirect.cc 2014-05-09 00:14:30 +0000 @@ -143,14 +143,14 @@ // check and parse for obsoleted Squid-2 urlgroup feature if (*result == '!') { - static int urlgroupWarning = 0; - if (!urlgroupWarning++) - debugs(85, DBG_IMPORTANT, "UPGRADE WARNING: URL rewriter using obsolete Squid-2 urlgroup feature needs updating."); - if (char *t = strchr(result+1, '!')) { - *t = '\0'; - newReply.notes.add("urlgroup", result+1); - result = t + 1; - } + static int urlgroupWarning = 0; + if (!urlgroupWarning++) + debugs(85, DBG_IMPORTANT, "UPGRADE WARNING: URL rewriter using obsolete Squid-2 urlgroup feature needs updating."); + if (char *t = strchr(result+1, '!')) { + *t = '\0'; + newReply.notes.add("urlgroup", result+1); + result = t + 1; + } } const Http::StatusCode status = static_cast(atoi(result));