Merge pull request #4842 from tesilaaliset/fix/fix_relase_bugs

lymanjre · web-flow · commit 5486c8862c09 · 2025-03-30T12:21:56.000+03:30
diff --git a/common/packages.lock b/common/packages.lock
@@ -1,3 +1,5 @@
+xray|25.3.6|amd64|https://github.com/XTLS/Xray-core/releases/download/v25.3.6/Xray-linux-64.zip|82d4be3a5ed8bd2621df9c9913c3a2761b86a42ae8485da836f7447ff2ec3d4d
+xray|25.3.6|arm64|https://github.com/XTLS/Xray-core/releases/download/v25.3.6/Xray-linux-arm64-v8a|1595f446b3d3a2bfe4a737e3cdb4c189c8c4e271322a7a2a0f5ea735b9511e80
 xray|25.2.21|amd64|https://github.com/XTLS/Xray-core/releases/download/v25.2.21/Xray-linux-64.zip|3e90f0bbb5bbb2b397f46fec96b0eb4a240448bf8d282666da2f80cbaaa24fe7
 xray|25.2.21|arm64|https://github.com/XTLS/Xray-core/releases/download/v25.2.21/Xray-linux-arm64-v8a.zip|5f4d82f0d02a8646a0af0debd027503c2a8a752f04dd7f0539037ca877bb2e33
 xray|24.11.30|amd64|https://github.com/XTLS/Xray-core/releases/download/v24.11.30/Xray-linux-64.zip|679d6ec1c2ecabd84ad1e2deab6e52789c52f0a387902cc72e135a3bb3949554
diff --git a/xray/add_version.sh b/xray/add_version.sh
diff --git a/xray/configs/05_inbounds_02_realityh2_main.json.j2 b/xray/configs/05_inbounds_02_realityh2_main.json.j2
@@ -23,6 +23,9 @@
 				"tcpSettings": {
 					"acceptProxyProtocol": true 
 				},
+                "xhttpSettings": {
+                  "mode": "auto"
+                },
 				"security": "reality", 
 				"realitySettings": {
 						"show": false, 
diff --git a/xray/configs/05_inbounds_10_trojan_splithttp.json.j2 b/xray/configs/05_inbounds_10_trojan_splithttp.json.j2
@@ -18,7 +18,8 @@
 				"network": "xhttp",
 				"security": "none",
 				"xhttpSettings": {
-					{# "acceptProxyProtocol": true, #}
+                    "mode": "auto",
+                    {# "acceptProxyProtocol": true, #}
 					"path":"/{{ hconfigs['path_trojan'] }}{{ hconfigs['path_xhttp'] }}", 
 				}
 				},
diff --git a/xray/configs/05_inbounds_10_vless_splithttp.json.j2 b/xray/configs/05_inbounds_10_vless_splithttp.json.j2
@@ -19,6 +19,7 @@
 				"network": "xhttp",
 				"security": "none",
 				"xhttpSettings": {
+                    "mode": "auto",
 					{# "acceptProxyProtocol": true,#}
 					"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_xhttp'] }}", 
 				}
diff --git a/xray/configs/05_inbounds_10_vmess_splithttp.json.j2 b/xray/configs/05_inbounds_10_vmess_splithttp.json.j2
@@ -18,6 +18,7 @@
 				"network": "xhttp",
 				"security": "none",
 				"xhttpSettings": {
+                    "mode": "auto",
 					{#"acceptProxyProtocol": true,#}
 					"path": "/{{ hconfigs['path_vmess'] }}{{ hconfigs['path_xhttp'] }}", 
 				}
diff --git a/xray/configs/05_inbounds_h2_trojan_splithttp.json.j2 b/xray/configs/05_inbounds_h2_trojan_splithttp.json.j2
@@ -1,5 +1,5 @@
 {
-	{% and hconfigs['trojan_enable'] and hconfigs['xhttp_enable'] %}
+	{% if hconfigs['trojan_enable'] and hconfigs['xhttp_enable'] %}
 		"inbounds": [
 			{
 				"tag":"trojan-xhttp-h2",
diff --git a/xray/configs/05_inbounds_h2_vless_new.json.j2 b/xray/configs/05_inbounds_h2_vless_new.json.j2
@@ -18,7 +18,7 @@
 				"network": "xhttp",
 				"security": "none",
 				"xhttpSettings": {
-                    "mode": "stream-one",
+                    "mode": "auto",
 					"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_tcp'] }}",
 					}
 				
diff --git a/xray/configs/05_inbounds_h2_vless_splithttp.json.j2 b/xray/configs/05_inbounds_h2_vless_splithttp.json.j2
@@ -1,5 +1,5 @@
 {
-	{% and hconfigs['vless_enable'] and hconfigs['xhttp_enable'] %}
+	{% if hconfigs['vless_enable'] and hconfigs['xhttp_enable'] %}
 		"inbounds": [
 			{
 				"tag":"vless-xhttp-h2",
@@ -19,7 +19,8 @@
 				"security": "none",
 				"xhttpSettings": {
 					{# "acceptProxyProtocol": true,#}
-					"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_xhttp'] }}2", 
+					"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_xhttp'] }}2",
+                    "mode": "auto"
 				}
 				},
 				"sniffing": {
diff --git a/xray/configs/05_inbounds_h2_vmess_splithttp.json.j2 b/xray/configs/05_inbounds_h2_vmess_splithttp.json.j2
@@ -18,7 +18,8 @@
 				"security": "none",
 				"xhttpSettings": {
 					{#"acceptProxyProtocol": true,#}
-					"path": "/{{ hconfigs['path_vmess'] }}{{ hconfigs['path_xhttp'] }}2", 
+					"path": "/{{ hconfigs['path_vmess'] }}{{ hconfigs['path_xhttp'] }}2",
+                    "mode": "auto"
 				}
 				},
 				"sniffing": {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+xray\|25.3.6\|amd64\|https://github.com/XTLS/Xray-core/releases/download/v25.3.6/Xray-linux-64.zip\|82d4be3a5ed8bd2621df9c9913c3a2761b86a42ae8485da836f7447ff2ec3d4d`
	`2`	`+xray\|25.3.6\|arm64\|https://github.com/XTLS/Xray-core/releases/download/v25.3.6/Xray-linux-arm64-v8a\|1595f446b3d3a2bfe4a737e3cdb4c189c8c4e271322a7a2a0f5ea735b9511e80`
`1`	`3`	`xray\|25.2.21\|amd64\|https://github.com/XTLS/Xray-core/releases/download/v25.2.21/Xray-linux-64.zip\|3e90f0bbb5bbb2b397f46fec96b0eb4a240448bf8d282666da2f80cbaaa24fe7`
`2`	`4`	`xray\|25.2.21\|arm64\|https://github.com/XTLS/Xray-core/releases/download/v25.2.21/Xray-linux-arm64-v8a.zip\|5f4d82f0d02a8646a0af0debd027503c2a8a752f04dd7f0539037ca877bb2e33`
`3`	`5`	`xray\|24.11.30\|amd64\|https://github.com/XTLS/Xray-core/releases/download/v24.11.30/Xray-linux-64.zip\|679d6ec1c2ecabd84ad1e2deab6e52789c52f0a387902cc72e135a3bb3949554`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`"network": "xhttp",`
`20`	`20`	`"security": "none",`
`21`	`21`	`"xhttpSettings": {`
	`22`	`+ "mode": "auto",`
`22`	`23`	`{# "acceptProxyProtocol": true,#}`
`23`	`24`	`"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_xhttp'] }}",`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`"network": "xhttp",`
`19`	`19`	`"security": "none",`
`20`	`20`	`"xhttpSettings": {`
	`21`	`+ "mode": "auto",`
`21`	`22`	`{#"acceptProxyProtocol": true,#}`
`22`	`23`	`"path": "/{{ hconfigs['path_vmess'] }}{{ hconfigs['path_xhttp'] }}",`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- {% and hconfigs['trojan_enable'] and hconfigs['xhttp_enable'] %}`
	`2`	`+ {% if hconfigs['trojan_enable'] and hconfigs['xhttp_enable'] %}`
`3`	`3`	`"inbounds": [`
`4`	`4`	`{`
`5`	`5`	`"tag":"trojan-xhttp-h2",`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"network": "xhttp",`
`19`	`19`	`"security": "none",`
`20`	`20`	`"xhttpSettings": {`
`21`		`- "mode": "stream-one",`
	`21`	`+ "mode": "auto",`
`22`	`22`	`"path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_tcp'] }}",`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- {% and hconfigs['vless_enable'] and hconfigs['xhttp_enable'] %}`
	`2`	`+ {% if hconfigs['vless_enable'] and hconfigs['xhttp_enable'] %}`
`3`	`3`	`"inbounds": [`
`4`	`4`	`{`
`5`	`5`	`"tag":"vless-xhttp-h2",`
`@@ -19,7 +19,8 @@`
`19`	`19`	`"security": "none",`
`20`	`20`	`"xhttpSettings": {`
`21`	`21`	`{# "acceptProxyProtocol": true,#}`
`22`		`- "path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_xhttp'] }}2",`
	`22`	`+ "path": "/{{ hconfigs['path_vless'] }}{{ hconfigs['path_xhttp'] }}2",`
	`23`	`+ "mode": "auto"`
`23`	`24`	`}`
`24`	`25`	`},`
`25`	`26`	`"sniffing": {`