Skip to content

Commit e5d08bb

Browse files
author
kerry
committed
add alpn into tlsSetting, fix fallback bug
1 parent 77d8444 commit e5d08bb

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

web/assets/js/model/xray.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,11 @@ class GrpcStreamSettings extends XrayCommonClass {
417417

418418
class TlsStreamSettings extends XrayCommonClass {
419419
constructor(serverName='',
420-
certificates=[new TlsStreamSettings.Cert()]) {
420+
certificates=[new TlsStreamSettings.Cert()], alpn=[]) {
421421
super();
422422
this.server = serverName;
423423
this.certs = certificates;
424+
this.alpn = alpn;
424425
}
425426

426427
addCert(cert) {
@@ -436,16 +437,19 @@ class TlsStreamSettings extends XrayCommonClass {
436437
if (!ObjectUtil.isEmpty(json.certificates)) {
437438
certs = json.certificates.map(cert => TlsStreamSettings.Cert.fromJson(cert));
438439
}
440+
439441
return new TlsStreamSettings(
440442
json.serverName,
441443
certs,
444+
json.alpn
442445
);
443446
}
444447

445448
toJson() {
446449
return {
447450
serverName: this.server,
448451
certificates: TlsStreamSettings.toJsonArray(this.certs),
452+
alpn: this.alpn
449453
};
450454
}
451455
}

web/html/xui/form/tls_settings.html

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<a-form-item label="域名">
1717
<a-input v-model.trim="inbound.stream.tls.server"></a-input>
1818
</a-form-item>
19+
<a-form-item label="alpn" placeholder="http/1.1,h2">
20+
<a-input v-model.trim="inbound.stream.tls.alpn"></a-input>
21+
</a-form-item>
1922
<a-form-item label="证书">
2023
<a-radio-group v-model="inbound.stream.tls.certs[0].useFile"
2124
button-style="solid">

0 commit comments

Comments
 (0)