Hi all, the attached patch refactors the use of wordlist to SBufList in acl/RegexData.cc; the "test.txt" attachment shows the output of "./src/squid -X 2>&1 | grep 'RegexData' >/tmp/test_plan.txt" when applied to a default configuration file with these additions: acl t1 dstdom_regex pattern1 pattern2 acl t2 dstdom_regex -i pattern3 pattern4 acl t3 dstdom_regex +i pattern5 pattern6
--
Francesco Chemolli
2016/10/26 21:07:27.313| 28,2| RegexData.cc(228) parse: new Regex line or file 2016/10/26 21:07:27.313| 28,3| RegexData.cc(237) parse: buffering RE '-i' 2016/10/26 21:07:27.313| 28,3| RegexData.cc(237) parse: buffering RE '^cache_object://' 2016/10/26 21:07:27.313| 28,3| RegexData.cc(237) parse: buffering RE '+i' 2016/10/26 21:07:27.314| 28,3| RegexData.cc(237) parse: buffering RE '^https?://[^/]+/squid-internal-mgr/' 2016/10/26 21:07:27.314| 28,2| RegexData.cc(151) compileOptimisedREs: compileOptimisedREs: -i 2016/10/26 21:07:27.314| 28,2| RegexData.cc(169) compileOptimisedREs: compileOptimisedREs: adding RE '^cache_object://' 2016/10/26 21:07:27.314| 28,2| RegexData.cc(162) compileOptimisedREs: compileOptimisedREs: +i 2016/10/26 21:07:27.314| 28,2| RegexData.cc(118) compileRE: compiled '(^cache_object://)' with flags 7 2016/10/26 21:07:27.315| 28,2| RegexData.cc(169) compileOptimisedREs: compileOptimisedREs: adding RE '^https?://[^/]+/squid-internal-mgr/' 2016/10/26 21:07:27.315| 28,2| RegexData.cc(118) compileRE: compiled '(^https?://[^/]+/squid-internal-mgr/)' with flags 5 2016/10/26 21:07:27.315| 28,2| RegexData.cc(197) compileOptimisedREs: compileOptimisedREs: 2 REs are optimised into one RE. 2016/10/26 21:07:27.337| 28,2| RegexData.cc(228) parse: new Regex line or file 2016/10/26 21:07:27.337| 28,3| RegexData.cc(237) parse: buffering RE 'pattern1' 2016/10/26 21:07:27.337| 28,3| RegexData.cc(237) parse: buffering RE 'pattern2' 2016/10/26 21:07:27.337| 28,2| RegexData.cc(169) compileOptimisedREs: compileOptimisedREs: adding RE 'pattern1' 2016/10/26 21:07:27.338| 28,2| RegexData.cc(169) compileOptimisedREs: compileOptimisedREs: adding RE 'pattern2' 2016/10/26 21:07:27.338| 28,2| RegexData.cc(118) compileRE: compiled '(pattern1)|(pattern2)' with flags 5 2016/10/26 21:07:27.338| 28,2| RegexData.cc(197) compileOptimisedREs: compileOptimisedREs: 2 REs are optimised into one RE. 2016/10/26 21:07:27.338| 28,2| RegexData.cc(228) parse: new Regex line or file 2016/10/26 21:07:27.338| 28,3| RegexData.cc(237) parse: buffering RE '-i' 2016/10/26 21:07:27.338| 28,3| RegexData.cc(237) parse: buffering RE 'pattern3' 2016/10/26 21:07:27.338| 28,3| RegexData.cc(237) parse: buffering RE 'pattern4' 2016/10/26 21:07:27.338| 28,2| RegexData.cc(151) compileOptimisedREs: compileOptimisedREs: -i 2016/10/26 21:07:27.338| 28,2| RegexData.cc(169) compileOptimisedREs: compileOptimisedREs: adding RE 'pattern3' 2016/10/26 21:07:27.338| 28,2| RegexData.cc(169) compileOptimisedREs: compileOptimisedREs: adding RE 'pattern4' 2016/10/26 21:07:27.338| 28,2| RegexData.cc(118) compileRE: compiled '(pattern3)|(pattern4)' with flags 7 2016/10/26 21:07:27.338| 28,2| RegexData.cc(197) compileOptimisedREs: compileOptimisedREs: 2 REs are optimised into one RE. 2016/10/26 21:07:27.338| 28,2| RegexData.cc(228) parse: new Regex line or file 2016/10/26 21:07:27.338| 28,3| RegexData.cc(237) parse: buffering RE '+i' 2016/10/26 21:07:27.338| 28,3| RegexData.cc(237) parse: buffering RE 'pattern5' 2016/10/26 21:07:27.338| 28,3| RegexData.cc(237) parse: buffering RE 'pattern6' 2016/10/26 21:07:27.339| 28,2| RegexData.cc(160) compileOptimisedREs: compileOptimisedREs: optimisation of +i ... +i 2016/10/26 21:07:27.339| 28,2| RegexData.cc(169) compileOptimisedREs: compileOptimisedREs: adding RE 'pattern5' 2016/10/26 21:07:27.339| 28,2| RegexData.cc(169) compileOptimisedREs: compileOptimisedREs: adding RE 'pattern6' 2016/10/26 21:07:27.339| 28,2| RegexData.cc(118) compileRE: compiled '(pattern5)|(pattern6)' with flags 5 2016/10/26 21:07:27.339| 28,2| RegexData.cc(197) compileOptimisedREs: compileOptimisedREs: 2 REs are optimised into one RE.
wordlist-sbuflist-aclregexdata.patch
Description: Binary data
_______________________________________________ squid-dev mailing list [email protected] http://lists.squid-cache.org/listinfo/squid-dev
