From 606d4077c7c90079b058c34787dad3bee26af5cd Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Tue, 10 Sep 2024 12:42:01 +0800
Subject: [PATCH] luci-app-passwall: sync upstream

last commit: https://github.com/xiaorouji/openwrt-passwall/commit/a5ea05fee3d86444d9c799dbc8f9837e7b2fdc31
---
 .../view/passwall/node_list/link_share_man.htm     |  7 +++++++
 .../root/usr/share/passwall/subscribe.lua          | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
index a3bbbfabf..f5b164aa2 100644
--- a/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
+++ b/luci-app-passwall/luasrc/view/passwall/node_list/link_share_man.htm
@@ -371,6 +371,10 @@ local api = require "luci.passwall.api"
 				v_transport = "splithttp";
 				params += opt.query("host", dom_prefix + "splithttp_host");
 				params += opt.query("path", dom_prefix + "splithttp_path");
+			} else if (v_transport === "httpupgrade") {
+				v_transport = "httpupgrade";
+				params += opt.query("host", dom_prefix + "httpupgrade_host");
+				params += opt.query("path", dom_prefix + "httpupgrade_path");
 			}
 			params += "&type=" + v_transport;
 
@@ -1149,6 +1153,9 @@ local api = require "luci.passwall.api"
 			} else if (queryParam.type === "splithttp") {
 				opt.set(dom_prefix + 'splithttp_host', queryParam.host || "");
 				opt.set(dom_prefix + 'splithttp_path', queryParam.path || "");
+			} else if (queryParam.type === "httpupgrade") {
+				opt.set(dom_prefix + 'httpupgrade_host', queryParam.host || "");
+				opt.set(dom_prefix + 'httpupgrade_path', queryParam.path || "");
 			}
 
 			if (m.hash) {
diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
index 0847dcbe7..b2d4154bb 100755
--- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua
+++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua
@@ -492,6 +492,10 @@ local function processData(szType, content, add_mode, add_from)
 			result.splithttp_host = info.host
 			result.splithttp_path = info.path
 		end
+		if info.net == 'httpupgrade' then
+			result.httpupgrade_host = info.host
+			result.httpupgrade_path = info.path
+		end
 		if not info.security then result.security = "auto" end
 		if info.tls == "tls" or info.tls == "1" then
 			result.tls = "1"
@@ -835,7 +839,11 @@ local function processData(szType, content, add_mode, add_from)
 				result.splithttp_host = params.host
 				result.splithttp_path = params.path
 			end
-			
+			if params.type == 'httpupgrade' then
+				result.httpupgrade_host = params.host
+				result.httpupgrade_path = params.path
+			end
+
 			result.encryption = params.encryption or "none"
 
 			result.flow = params.flow or nil
@@ -968,6 +976,10 @@ local function processData(szType, content, add_mode, add_from)
 				result.splithttp_host = params.host
 				result.splithttp_path = params.path
 			end
+			if params.type == 'httpupgrade' then
+				result.httpupgrade_host = params.host
+				result.httpupgrade_path = params.path
+			end
 			
 			result.encryption = params.encryption or "none"