diff options
| author | Ho3ein <ho3ein.sanaei@gmail.com> | 2023-04-14 14:52:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-14 14:52:33 +0300 |
| commit | 19bb28cb261a6ab89a2ee565323b88c5469cbef5 (patch) | |
| tree | c36d3888771f9c4410e0e8d526abfc1f4b218c6d | |
| parent | b70ecc12b3870fe7ed77242b77369008de4b5441 (diff) | |
| parent | 1e72a22c96fcc8690f7c6bdbb7a270a2b6cef97f (diff) | |
Merge pull request #262 from MHSanaei/dev
alpn set by default + syntax fix
| -rw-r--r-- | web/assets/js/model/xray.js | 2 | ||||
| -rw-r--r-- | web/html/xui/form/stream/stream_settings.html | 2 | ||||
| -rw-r--r-- | web/service/tgbot.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js index 31a192af..f5c7da3f 100644 --- a/web/assets/js/model/xray.js +++ b/web/assets/js/model/xray.js @@ -480,7 +480,7 @@ class TlsStreamSettings extends XrayCommonClass { maxVersion = TLS_VERSION_OPTION.TLS13, cipherSuites = '', certificates=[new TlsStreamSettings.Cert()], - alpn=[], + alpn=[ALPN_OPTION.H2,ALPN_OPTION.HTTP1], settings=[new TlsStreamSettings.Settings()]) { super(); this.server = serverName; diff --git a/web/html/xui/form/stream/stream_settings.html b/web/html/xui/form/stream/stream_settings.html index 3db72fe5..95d8df09 100644 --- a/web/html/xui/form/stream/stream_settings.html +++ b/web/html/xui/form/stream/stream_settings.html @@ -6,7 +6,7 @@ <a-select-option value="tcp">TCP</a-select-option> <a-select-option value="kcp">KCP</a-select-option> <a-select-option value="ws">WS</a-select-option> - <a-select-option value="http">HTTP</a-select-option> + <a-select-option value="http">H2</a-select-option> <a-select-option value="quic">QUIC</a-select-option> <a-select-option value="grpc">gRPC</a-select-option> </a-select> diff --git a/web/service/tgbot.go b/web/service/tgbot.go index 6da0df57..b40e0e29 100644 --- a/web/service/tgbot.go +++ b/web/service/tgbot.go @@ -167,7 +167,7 @@ func (t *Tgbot) asnwerCallback(callbackQuery *tgbotapi.CallbackQuery, isAdmin bo case "client_traffic": t.getClientUsage(callbackQuery.From.ID, callbackQuery.From.UserName) case "client_commands": - t.SendMsgToTgbot(callbackQuery.From.ID, "To search for statistics, just use folowing command:\r\n \r\n<code>/usage [UID|Passowrd]</code>\r\n \r\nUse UID for vmess/vless and Password for Trojan.") + t.SendMsgToTgbot(callbackQuery.From.ID, "To search for statistics, just use folowing command:\r\n \r\n<code>/usage [UID|Password]</code>\r\n \r\nUse UID for vmess/vless and Password for Trojan.") case "commands": t.SendMsgToTgbot(callbackQuery.From.ID, "Search for a client email:\r\n<code>/usage email</code>\r\n \r\nSearch for inbounds (with client stats):\r\n<code>/inbound [remark]</code>") } |