diff --git a/adblock-for-dnsmasq.conf b/adblock-for-dnsmasq.conf index 57bff958..022d2776 100644 --- a/adblock-for-dnsmasq.conf +++ b/adblock-for-dnsmasq.conf @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20200610142732 +#VER=20200611014336 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=34665 +#TOTAL_LINES=34664 address=/00-gov.cn/ address=/kwcdn.000dn.com/ address=/kwcscdn.000dn.com/ @@ -5330,7 +5330,6 @@ address=/mgzs.cdn.bcebos.com/ address=/ys2000.cdn.bcebos.com/ address=/cpu-baidu-com-block.cdn.bcebos.com/ address=/dd713.bj.bcebos.com/ -address=/fc-.cdn.bcebos.com/ address=/hzyd.cdn.bcebos.com/ address=/tob-cms.bj.bcebos.com/ address=/vv84.bj.bcebos.com/ diff --git a/anti-ad-domains.txt b/anti-ad-domains.txt index ed8146fe..467a1a62 100644 --- a/anti-ad-domains.txt +++ b/anti-ad-domains.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20200610142732 +#VER=20200611014336 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=39799 +#TOTAL_LINES=39798 00-gov.cn kwcdn.000dn.com kwcscdn.000dn.com @@ -6383,7 +6383,6 @@ mgzs.cdn.bcebos.com ys2000.cdn.bcebos.com cpu-baidu-com-block.cdn.bcebos.com dd713.bj.bcebos.com -fc-.cdn.bcebos.com hzyd.cdn.bcebos.com tob-cms.bj.bcebos.com vv84.bj.bcebos.com diff --git a/anti-ad-easylist.txt b/anti-ad-easylist.txt index e5111d30..47755556 100644 --- a/anti-ad-easylist.txt +++ b/anti-ad-easylist.txt @@ -1,7 +1,7 @@ !TITLE=anti-AD -!VER=20200610142732 +!VER=20200611014336 !URL=https://github.com/privacy-protection-tools/anti-AD -!TOTAL_LINES=32921 +!TOTAL_LINES=32920 ||*serror*.wo.com.cn^ ||201*.myhard.com^ ||8*.tianya.cn^ @@ -4973,7 +4973,6 @@ ||ys2000.cdn.bcebos.com^ ||cpu-baidu-com-block.cdn.bcebos.com^ ||dd713.bj.bcebos.com^ -||fc-.cdn.bcebos.com^ ||hzyd.cdn.bcebos.com^ ||tob-cms.bj.bcebos.com^ ||vv84.bj.bcebos.com^ diff --git a/anti-ad-smartdns.conf b/anti-ad-smartdns.conf index f920cf3f..1c6a7536 100644 --- a/anti-ad-smartdns.conf +++ b/anti-ad-smartdns.conf @@ -1,7 +1,7 @@ #TITLE=anti-AD for SmartDNS -#VER=20200610142732 +#VER=20200611014336 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=34665 +#TOTAL_LINES=34664 address /00-gov.cn/# address /kwcdn.000dn.com/# address /kwcscdn.000dn.com/# @@ -5330,7 +5330,6 @@ address /mgzs.cdn.bcebos.com/# address /ys2000.cdn.bcebos.com/# address /cpu-baidu-com-block.cdn.bcebos.com/# address /dd713.bj.bcebos.com/# -address /fc-.cdn.bcebos.com/# address /hzyd.cdn.bcebos.com/# address /tob-cms.bj.bcebos.com/# address /vv84.bj.bcebos.com/# diff --git a/anti-ad-surge.txt b/anti-ad-surge.txt index cd8a9332..ed1bba83 100644 --- a/anti-ad-surge.txt +++ b/anti-ad-surge.txt @@ -1,7 +1,7 @@ #TITLE=anti-AD -#VER=20200610142732 +#VER=20200611014336 #URL=https://github.com/privacy-protection-tools/anti-AD -#TOTAL_LINES=34665 +#TOTAL_LINES=34664 DOMAIN-SUFFIX,00-gov.cn DOMAIN-SUFFIX,kwcdn.000dn.com DOMAIN-SUFFIX,kwcscdn.000dn.com @@ -5330,7 +5330,6 @@ DOMAIN-SUFFIX,mgzs.cdn.bcebos.com DOMAIN-SUFFIX,ys2000.cdn.bcebos.com DOMAIN-SUFFIX,cpu-baidu-com-block.cdn.bcebos.com DOMAIN-SUFFIX,dd713.bj.bcebos.com -DOMAIN-SUFFIX,fc-.cdn.bcebos.com DOMAIN-SUFFIX,hzyd.cdn.bcebos.com DOMAIN-SUFFIX,tob-cms.bj.bcebos.com DOMAIN-SUFFIX,vv84.bj.bcebos.com diff --git a/lib/addressMaker.class.php b/lib/addressMaker.class.php index 64f2648e..2e797850 100644 --- a/lib/addressMaker.class.php +++ b/lib/addressMaker.class.php @@ -25,7 +25,7 @@ class addressMaker{ return ""; } - $str_reg = '/^(?:(?:[a-z0-9\-]+\.)*?|\.)?([a-z0-9\-]+('; + $str_reg = '/^(?:(?:[a-z0-9\-]*[a-z0-9]\.)*?|\.)?([a-z0-9\-]*[a-z0-9]('; /************start CN域名的特殊处理规则,其中包括了各行政区特别后缀的cn域名*****************************/ $str_reg .= '\.ac\.cn|\.ah\.cn|\.bj\.cn|\.com\.cn|\.cq\.cn|\.fj\.cn|\.gd\.cn|\.gov\.cn|\.gs\.cn'; $str_reg .= '|\.gx\.cn|\.gz\.cn|\.ha\.cn|\.hb\.cn|\.he\.cn|\.hi\.cn|\.hk\.cn|\.hl\.cn|\.hn\.cn';