jh163888/anti-AD
1
0
Fork 0
mirror of https://github.com/privacy-protection-tools/anti-AD.git synced 2025-02-02 11:43:00 +08:00
Code Issues Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
gently 2019-12-17 20:35:43 +08:00
parent 2ff209b3e1
commit 61d0539b48
5 changed files with 10124 additions and 20105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10170
adblock-for-dnsmasq.conf
View File

File diff suppressed because it is too large Load Diff

10170
anti-ad-easylist.txt
View File

File diff suppressed because it is too large Load Diff

9885
anti-ad-surge.txt
View File

File diff suppressed because it is too large Load Diff

2
lib/addressMaker.class.php
View File

@ -74,7 +74,7 @@ class addressMaker {
continue; continue;
} }
if(preg_match('/^\|\|([0-9a-z\-\.]+[a-z]+)[\^\$]*(image|third-party|script)?(,.+)?$/', $line, $matches)){ if(preg_match('/^\|\|([0-9a-z\-\.]+[a-z]+)[\^\$]*([\~0-9a-zA-Z\.\-_]+,)?(image|third-party|script)(,.+)?$/', $line, $matches)){
if(substr($matches[1], 0, 4) == 'www.'){ if(substr($matches[1], 0, 4) == 'www.'){
$row = substr($matches[1], 4); $row = substr($matches[1], 4);

2
make-addr.php
View File

@ -32,6 +32,6 @@ $arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_list($
$arr_result = array_merge_recursive($arr_result, $arr_blacklist); $arr_result = array_merge_recursive($arr_result, $arr_blacklist);
echo 'Written file size:'; echo 'Written file size:';
echo addressMaker::write_to_conf($arr_result, writerFormat::EASYLIST); echo addressMaker::write_to_conf($arr_result, writerFormat::DNSMASQ);