Merge pull request #37 from dchusovitin/proxy-priority

Custom (or tor) proxies must have the higher priority
This commit is contained in:
Ilya Ig. Petrov 2018-08-01 16:19:06 +05:00 committed by GitHub
commit 1a92356e06

View File

@ -364,7 +364,7 @@
if (pacMods.filteredCustomsString) {
res += `
/******/
/******/ const filteredCustomProxies = "; ${pacMods.filteredCustomsString}";
/******/ const filteredCustomProxies = "${pacMods.filteredCustomsString}; ";
/******/`;
}
@ -440,6 +440,7 @@ ${ pacMods.filteredCustomsString
/******/ return "DIRECT";
/******/ }
/******/ return ` +
(pacMods.filteredCustomsString ? 'filteredCustomProxies + ' : '') +
function() {
if (!pacMods.ifUsePacScriptProxies) {
@ -452,7 +453,7 @@ ${ pacMods.filteredCustomsString
}
return filteredPacExp + ' + ';
}() + `${pacMods.filteredCustomsString ? 'filteredCustomProxies + ' : ''}directIfAllowed;`; // Without DIRECT you will get 'PROXY CONN FAILED' pac-error.
}() + `directIfAllowed;`; // Without DIRECT you will get 'PROXY CONN FAILED' pac-error.
}()
}