Merge branch 'fix/tld'

Fixed breakage in tld.js generation when for any reason the source pubblic suffix list contains CRLF characters.

1 files changed, 3 insertions, 3 deletions

diff --git a/TLD/generate.pl b/TLD/generate.pl
index 748f66d..e37ffd5 100644
--- a/TLD/generate.pl
+++ b/TLD/generate.pl
@@ -14,7 +14,7 @@ sub generate {
   while(<DAT>) {
     s/\./\\\./g;
     s/\s+utf.*//;
-    s/\n//;
+    s/[\r\n]//g;
     if(/^!/) {
       s/^!//; 
       push(@ex, lc($_));
@@ -42,8 +42,8 @@ sub generate {
   open(SRC, $src) || die("Cannot open $src");
   open(DST, ">$dst") || die("Cannot open $dst");
   while(<SRC>) {
-    s/(_tldRx:\s*\/\(.*?\))[\s\S]*?(\$\/)/$1$rx$2/g;
-    s/(_tldEx:\s*\/\(.*?\))[\s\S]*?(\$\/)/$1$ex$2/g;
+    s/(_tldRx:\s*\/\(.*?\)).*?(?=\$\/)/$1$rx/s;
+    s/(_tldEx:\s*\/\(.*?\)).*?(?=\$\/)/$1$ex/s;
     print DST;
     print;
   }