luci-app-ssr-plus: sync upstream

last commit: 9c99a24125
This commit is contained in:
actions 2024-06-28 03:30:04 +08:00
parent 5f58b71e22
commit 7cf3f43257
4 changed files with 25 additions and 1 deletions

View File

@ -622,6 +622,7 @@ o:value("tcp", "TCP")
o:value("kcp", "mKCP")
o:value("ws", "WebSocket")
o:value("httpupgrade", "HTTPUpgrade")
o:value("splithttp", "SplitHTTP")
o:value("h2", "HTTP/2")
o:value("quic", "QUIC")
o:value("grpc", "gRPC")
@ -690,6 +691,18 @@ o = s:option(Value, "httpupgrade_path", translate("Httpupgrade Path"))
o:depends("transport", "httpupgrade")
o.rmempty = true
-- [[ splithttp部分 ]]--
-- splithttp域名
o = s:option(Value, "splithttp_host", translate("Splithttp Host"))
o:depends({transport = "splithttp", tls = false})
o.rmempty = true
-- splithttp路径
o = s:option(Value, "splithttp_path", translate("Splithttp Path"))
o:depends("transport", "splithttp")
o.rmempty = true
-- [[ H2部分 ]]--
-- H2域名

View File

@ -855,6 +855,12 @@ msgstr "HTTPUpgrade 主机名"
msgid "Httpupgrade Path"
msgstr "HTTPUpgrade 路径"
msgid "Splithttp Host"
msgstr "SplitHTTP 主机名"
msgid "Splithttp Path"
msgstr "SplitHTTP 路径"
msgid "HTTP/2 Host"
msgstr "HTTP/2 主机名"

View File

@ -235,6 +235,11 @@ local Xray = {
host = (server.httpupgrade_host or server.tls_host) or nil,
path = server.httpupgrade_path or ""
} or nil,
splithttpSettings = (server.transport == "splithttp") and {
-- splithttp
host = (server.splithttp_host or server.tls_host) or nil,
path = server.splithttp_path or ""
} or nil,
httpSettings = (server.transport == "h2") and {
-- h2
path = server.h2_path or "",

View File

@ -430,7 +430,7 @@ index 479d7e2..5eecbee 100644
}
}
diff --git a/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po b/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
index e292f10..07c6dbc 100644
index 8184bee..60ac526 100644
--- a/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
+++ b/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
@@ -552,27 +552,6 @@ msgstr "使用 DNS2TCP 查询"