Дополнительная обработка доменов из-за криворукости РКН

max197616 · Feb 15, 2018 · 58b7d68 · 58b7d68
1 parent 46345a0
commit 58b7d68
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/scripts/extfilter-maker/extfilter_maker.pl b/scripts/extfilter-maker/extfilter_maker.pl
@@ -90,9 +90,9 @@
 {
 	my $dm = $ips->{domain};
 	$dm =~ s/\*\.//g;
-	my $domain_canonical=new URI("http://".$dm)->canonical();
-	$domain_canonical =~ s/^http\:\/\///;
-	$domain_canonical =~ s/\/$//;
+	$dm =~ s/\\//g;
+	my $uri = new URI("http://".$dm);
+	my $domain_canonical = lc($uri->host());
 	treeAddDomain(\%domains, "*.".$domain_canonical, 1);
 	print $DOMAINS_FILE "*.",$domain_canonical,"\n";
 	if($domains_ssl eq "true")
@@ -106,9 +106,9 @@
 while (my $ips = $sth->fetchrow_hashref())
 {
 	my $domain=$ips->{domain};
-	my $domain_canonical=new URI("http://".$domain)->canonical();
-	$domain_canonical =~ s/^http\:\/\///;
-	$domain_canonical =~ s/\/$//;
+	$domain =~ s/\\//g;
+	my $uri = new URI("http://".$domain);
+	my $domain_canonical = lc($uri->host());
 	next if(treeFindDomain(\%domains, $domain_canonical));
 	treeAddDomain(\%domains, $domain_canonical, 0);
 	$logger->debug("Canonical domain: $domain_canonical");