From 7cf3f432572daa40712b448e5da2222f17c5dad5 Mon Sep 17 00:00:00 2001
From: actions <action@github.com>
Date: Fri, 28 Jun 2024 03:30:04 +0800
Subject: [PATCH] luci-app-ssr-plus: sync upstream

last commit: https://github.com/fw876/helloworld/commit/9c99a241255aa28fc567e921b544220f0008a0c8
---
 .../luasrc/model/cbi/shadowsocksr/client-config.lua | 13 +++++++++++++
 luci-app-ssr-plus/po/zh_Hans/ssr-plus.po            |  6 ++++++
 .../root/usr/share/shadowsocksr/gen_config.lua      |  5 +++++
 patch-luci-app-ssr-plus.patch                       |  2 +-
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
index cd993d9d9..04871789c 100644
--- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
+++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
@@ -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域名
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 07c6dbcf4..60ac526d3 100644
--- a/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
+++ b/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
@@ -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 主机名"
 
diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
index 9c04c7436..545e0b88e 100755
--- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
+++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
@@ -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 "",
diff --git a/patch-luci-app-ssr-plus.patch b/patch-luci-app-ssr-plus.patch
index 578858dcf..5c9671177 100644
--- a/patch-luci-app-ssr-plus.patch
+++ b/patch-luci-app-ssr-plus.patch
@@ -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 查询"