修复小火箭订阅行为,避免下发空flow

This commit is contained in:
root 2023-08-20 23:54:54 +09:00
parent 451cfd341c
commit 0f0851c32b
7 changed files with 15 additions and 28 deletions

View File

@ -128,10 +128,8 @@ class General
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
if (isset($tlsSettings['flow']) && !empty($tlsSettings['flow'])) $config['flow'] = $tlsSettings['flow']; $output .= "&sni={$config['sni']}";
if ($config['flow'] !=="") $output .= "&flow={$config['flow']}";
$output .= "&sni={$config['sni']}" . "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

View File

@ -117,10 +117,8 @@ class Passwall
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
if (isset($tlsSettings['flow']) && !empty($tlsSettings['flow'])) $config['flow'] = $tlsSettings['flow']; $output .= "&sni={$config['sni']}";
if ($config['flow'] !=="") $output .= "&flow={$config['flow']}";
$output .= "&sni={$config['sni']}" . "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

View File

@ -110,10 +110,9 @@ class SSRPlus
if ($server['tls']) { if ($server['tls']) {
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) { if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
$config['sni'] = $tlsSettings['server_name'];
$output .= "&sni={$config['sni']}"; $output .= "&sni={$config['sni']}";
} if ($config['flow'] !=="") $output .= "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

View File

@ -123,10 +123,8 @@ class SagerNet
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
if (isset($tlsSettings['flow']) && !empty($tlsSettings['flow'])) $config['flow'] = $tlsSettings['flow']; $output .= "&sni={$config['sni']}";
if ($config['flow'] !=="") $output .= "&flow={$config['flow']}";
$output .= "&sni={$config['sni']}" . "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

View File

@ -151,10 +151,8 @@ class Shadowrocket
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
if (isset($tlsSettings['flow']) && !empty($tlsSettings['flow'])) $config['flow'] = $tlsSettings['flow']; $output .= "&sni={$config['sni']}";
if ($config['flow'] !=="") $output .= "&flow={$config['flow']}";
$output .= "&sni={$config['sni']}" . "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

View File

@ -128,10 +128,8 @@ class V2rayN
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
if (isset($tlsSettings['flow']) && !empty($tlsSettings['flow'])) $config['flow'] = $tlsSettings['flow']; $output .= "&sni={$config['sni']}";
if ($config['flow'] !=="") $output .= "&flow={$config['flow']}";
$output .= "&sni={$config['sni']}" . "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];

View File

@ -117,10 +117,8 @@ class V2rayNG
if ($server['tls_settings']) { if ($server['tls_settings']) {
$tlsSettings = $server['tls_settings']; $tlsSettings = $server['tls_settings'];
if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name'];
if (isset($tlsSettings['flow']) && !empty($tlsSettings['flow'])) $config['flow'] = $tlsSettings['flow']; $output .= "&sni={$config['sni']}";
if ($config['flow'] !=="") $output .= "&flow={$config['flow']}";
$output .= "&sni={$config['sni']}" . "&flow={$config['flow']}";
if ($server['tls'] == 2) { if ($server['tls'] == 2) {
$config['pbk'] = $tlsSettings['public_key']; $config['pbk'] = $tlsSettings['public_key'];
$config['sid'] = $tlsSettings['shortId']; $config['sid'] = $tlsSettings['shortId'];