From 0f0851c32bc4f1af4902c662de912cb2a3686842 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 20 Aug 2023 23:54:54 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=81=AB=E7=AE=AD?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E8=A1=8C=E4=B8=BA=EF=BC=8C=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E7=A9=BAflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Protocols/General.php | 6 ++---- app/Protocols/Passwall.php | 6 ++---- app/Protocols/SSRPlus.php | 7 +++---- app/Protocols/SagerNet.php | 6 ++---- app/Protocols/Shadowrocket.php | 6 ++---- app/Protocols/V2rayN.php | 6 ++---- app/Protocols/V2rayNG.php | 6 ++---- 7 files changed, 15 insertions(+), 28 deletions(-) diff --git a/app/Protocols/General.php b/app/Protocols/General.php index 48ebe8b7..2db907ac 100644 --- a/app/Protocols/General.php +++ b/app/Protocols/General.php @@ -128,10 +128,8 @@ class General if ($server['tls_settings']) { $tlsSettings = $server['tls_settings']; 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']}" . "&flow={$config['flow']}"; - + $output .= "&sni={$config['sni']}"; + if ($config['flow'] !=="") $output .= "&flow={$config['flow']}"; if ($server['tls'] == 2) { $config['pbk'] = $tlsSettings['public_key']; $config['sid'] = $tlsSettings['shortId']; diff --git a/app/Protocols/Passwall.php b/app/Protocols/Passwall.php index ffa10a25..30a2bc31 100644 --- a/app/Protocols/Passwall.php +++ b/app/Protocols/Passwall.php @@ -117,10 +117,8 @@ class Passwall if ($server['tls_settings']) { $tlsSettings = $server['tls_settings']; 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']}" . "&flow={$config['flow']}"; - + $output .= "&sni={$config['sni']}"; + if ($config['flow'] !=="") $output .= "&flow={$config['flow']}"; if ($server['tls'] == 2) { $config['pbk'] = $tlsSettings['public_key']; $config['sid'] = $tlsSettings['shortId']; diff --git a/app/Protocols/SSRPlus.php b/app/Protocols/SSRPlus.php index 7c04c3d3..5cd9d826 100644 --- a/app/Protocols/SSRPlus.php +++ b/app/Protocols/SSRPlus.php @@ -110,10 +110,9 @@ class SSRPlus if ($server['tls']) { if ($server['tls_settings']) { $tlsSettings = $server['tls_settings']; - if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) { - $config['sni'] = $tlsSettings['server_name']; - $output .= "&sni={$config['sni']}"; - } + if (isset($tlsSettings['server_name']) && !empty($tlsSettings['server_name'])) $config['sni'] = $tlsSettings['server_name']; + $output .= "&sni={$config['sni']}"; + if ($config['flow'] !=="") $output .= "&flow={$config['flow']}"; if ($server['tls'] == 2) { $config['pbk'] = $tlsSettings['public_key']; $config['sid'] = $tlsSettings['shortId']; diff --git a/app/Protocols/SagerNet.php b/app/Protocols/SagerNet.php index 0f5b030d..cdc0b475 100644 --- a/app/Protocols/SagerNet.php +++ b/app/Protocols/SagerNet.php @@ -123,10 +123,8 @@ class SagerNet if ($server['tls_settings']) { $tlsSettings = $server['tls_settings']; 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']}" . "&flow={$config['flow']}"; - + $output .= "&sni={$config['sni']}"; + if ($config['flow'] !=="") $output .= "&flow={$config['flow']}"; if ($server['tls'] == 2) { $config['pbk'] = $tlsSettings['public_key']; $config['sid'] = $tlsSettings['shortId']; diff --git a/app/Protocols/Shadowrocket.php b/app/Protocols/Shadowrocket.php index 64164c39..b82b61f7 100644 --- a/app/Protocols/Shadowrocket.php +++ b/app/Protocols/Shadowrocket.php @@ -151,10 +151,8 @@ class Shadowrocket if ($server['tls_settings']) { $tlsSettings = $server['tls_settings']; 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']}" . "&flow={$config['flow']}"; - + $output .= "&sni={$config['sni']}"; + if ($config['flow'] !=="") $output .= "&flow={$config['flow']}"; if ($server['tls'] == 2) { $config['pbk'] = $tlsSettings['public_key']; $config['sid'] = $tlsSettings['shortId']; diff --git a/app/Protocols/V2rayN.php b/app/Protocols/V2rayN.php index 64bead92..4c476cf9 100644 --- a/app/Protocols/V2rayN.php +++ b/app/Protocols/V2rayN.php @@ -128,10 +128,8 @@ class V2rayN if ($server['tls_settings']) { $tlsSettings = $server['tls_settings']; 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']}" . "&flow={$config['flow']}"; - + $output .= "&sni={$config['sni']}"; + if ($config['flow'] !=="") $output .= "&flow={$config['flow']}"; if ($server['tls'] == 2) { $config['pbk'] = $tlsSettings['public_key']; $config['sid'] = $tlsSettings['shortId']; diff --git a/app/Protocols/V2rayNG.php b/app/Protocols/V2rayNG.php index 06501c79..1a32c3a9 100644 --- a/app/Protocols/V2rayNG.php +++ b/app/Protocols/V2rayNG.php @@ -117,10 +117,8 @@ class V2rayNG if ($server['tls_settings']) { $tlsSettings = $server['tls_settings']; 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']}" . "&flow={$config['flow']}"; - + $output .= "&sni={$config['sni']}"; + if ($config['flow'] !=="") $output .= "&flow={$config['flow']}"; if ($server['tls'] == 2) { $config['pbk'] = $tlsSettings['public_key']; $config['sid'] = $tlsSettings['shortId'];