mirror of
https://github.com/privacy-protection-tools/anti-AD.git
synced 2025-01-22 14:29:16 +08:00
bug fix
This commit is contained in:
parent
2ff209b3e1
commit
61d0539b48
10170
adblock-for-dnsmasq.conf
10170
adblock-for-dnsmasq.conf
File diff suppressed because it is too large
Load Diff
10170
anti-ad-easylist.txt
10170
anti-ad-easylist.txt
File diff suppressed because it is too large
Load Diff
9885
anti-ad-surge.txt
9885
anti-ad-surge.txt
File diff suppressed because it is too large
Load Diff
@ -74,7 +74,7 @@ class addressMaker {
|
||||
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.'){
|
||||
$row = substr($matches[1], 4);
|
||||
|
@ -32,6 +32,6 @@ $arr_result = array_merge_recursive($arr_result, addressMaker::get_domain_list($
|
||||
$arr_result = array_merge_recursive($arr_result, $arr_blacklist);
|
||||
|
||||
echo 'Written file size:';
|
||||
echo addressMaker::write_to_conf($arr_result, writerFormat::EASYLIST);
|
||||
echo addressMaker::write_to_conf($arr_result, writerFormat::DNSMASQ);
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user