gandc/x-ui
1
0
Fork 0
mirror of https://github.com/alireza0/x-ui.git synced 2026-03-20 15:55:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

add alpn into tlsSetting, fix fallback bug

Browse Source
This commit is contained in:
kerry
2022-04-28 14:27:28 +08:00
parent 77d844460a
commit e5d08bb358
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/assets/js/model/xray.js
View File

@@ -417,10 +417,11 @@ class GrpcStreamSettings extends XrayCommonClass {
class TlsStreamSettings extends XrayCommonClass {
constructor(serverName='',
certificates=[new TlsStreamSettings.Cert()]) {
certificates=[new TlsStreamSettings.Cert()], alpn=[]) {
super();
this.server = serverName;
this.certs = certificates;
this.alpn = alpn;
}
addCert(cert) {
@@ -436,9 +437,11 @@ class TlsStreamSettings extends XrayCommonClass {
if (!ObjectUtil.isEmpty(json.certificates)) {
certs = json.certificates.map(cert => TlsStreamSettings.Cert.fromJson(cert));
}
return new TlsStreamSettings(
json.serverName,
certs,
json.alpn
);
}
@@ -446,6 +449,7 @@ class TlsStreamSettings extends XrayCommonClass {
return {
serverName: this.server,
certificates: TlsStreamSettings.toJsonArray(this.certs),
alpn: this.alpn
};
}
}