Merge branch 'master' into master

This commit is contained in:
Peng-YM 2021-10-24 14:26:29 +08:00 committed by GitHub
commit 53b8297e24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions

View File

@ -2380,7 +2380,12 @@ var ProxyUtils = (function () {
"🇮🇲": ["马恩岛","馬恩島"], "🇮🇲": ["马恩岛","馬恩島"],
"🇧🇾": ["BY","白俄罗斯"], "🇧🇾": ["BY","白俄罗斯"],
"🇵🇹": ["葡萄牙"], "🇵🇹": ["葡萄牙"],
"🇰🇪": ["KE", "肯尼亚"],
"🇰🇬": ["KG", "吉尔吉斯坦"],
"🇯🇴": ["JO", "约旦"],
"🇺🇾": ["UY", "乌拉圭"],
"🇲🇳":["蒙古"], "🇲🇳":["蒙古"],
"🇮🇷": ["IR", "伊朗"],
"🇵🇪":["秘鲁","祕魯"], "🇵🇪":["秘鲁","祕魯"],
"🇨🇴":["哥伦比亚"], "🇨🇴":["哥伦比亚"],
"🇪🇪":["爱沙尼亚"], "🇪🇪":["爱沙尼亚"],

File diff suppressed because one or more lines are too long

View File

@ -1560,7 +1560,7 @@ var ProxyUtils = (function () {
}`; }`;
case "http": case "http":
tls_opts = ""; tls_opts = "";
const base = `${proxy.name}=${proxy.tls ? "http" : "https"},${ const base = `${proxy.name}=${proxy.tls ? "https" : "http"},${
proxy.server proxy.server
},${proxy.port},${proxy.username || ""},${proxy.password || ""}`; },${proxy.port},${proxy.username || ""},${proxy.password || ""}`;
if (proxy.tls) { if (proxy.tls) {
@ -3176,4 +3176,4 @@ var YAML = (function () {
return processing_time; return processing_time;
}, },
}; };
})(); })();