驯服正则表达式

5 years ago · 5f4e854f51
parent f6a1fdbb58
commit 5f4e854f51
4 changed files with 62584 additions and 12400 deletions
--- a/adblock-for-dnsmasq.conf
+++ b/adblock-for-dnsmasq.conf
--- a/anti-ad-easylist.txt
+++ b/anti-ad-easylist.txt
--- a/anti-ad-surge.txt
+++ b/anti-ad-surge.txt
--- a/lib/addressMaker.class.php
+++ b/lib/addressMaker.class.php
@ -74,7 +74,7 @@ class addressMaker {
                continue;
            }

-            if(preg_match('/^\|\|([0-9a-z\-\.]+[a-z]+)[\^\$]*([\~0-9a-zA-Z\.\-_]+,)?(image|third-party|script)(,.+)?$/', $line, $matches)){
+            if(preg_match('/^\|\|([0-9a-z\-\.]+[a-z]+)\^(\$([^=]+?,)?(image|third-party|script)(,[^=]+)?)?$/', $line, $matches)){

                if(substr($matches[1], 0, 4) == 'www.'){
                    $row = substr($matches[1], 4);