From 239081d581eb9826cfd2cb59299b7e9fdb30ed56 Mon Sep 17 00:00:00 2001 From: ValdikSS Date: Sat, 5 Sep 2020 12:08:24 +0300 Subject: [PATCH] Remove leading www. for domain in the PAC file. getzones.awk removed leading www since the beginning. After commit 91b2584, which changed domain handling logic, this stopped working correctly for domains beginning with www. See https://ntc.party/t/pravda-com-ua/670 --- generate-pac.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generate-pac.sh b/generate-pac.sh index 7a02e3e..d4524c9 100755 --- a/generate-pac.sh +++ b/generate-pac.sh @@ -70,6 +70,9 @@ echo " if (domains.length < 10) return \"DIRECT\"; // list is broken else shost = host.replace(/(.+)\.([^.]+\.[^.]+$)/, \"\$2\"); + // remove leading www + shost = shost.replace(/^www\.(.+)/, \"\$1\"); + var curdomain = shost.match(/(.*)\\.([^.]+\$)/); if (!curdomain || !curdomain[2]) {return \"DIRECT\";} var curhost = curdomain[1];