Merge pull request #355 from wloot/patch-1

Patch 1
This commit is contained in:
tokumeikoi 2020-12-11 16:08:37 +08:00 committed by GitHub
commit b58df71db4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -46,9 +46,9 @@ class QuantumultX
if ($server['tlsSettings']) { if ($server['tlsSettings']) {
$tlsSettings = json_decode($server['tlsSettings'], true); $tlsSettings = json_decode($server['tlsSettings'], true);
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure'])) if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
array_push($config, 'tls-verification=' . $tlsSettings['allowInsecure'] ? 'false' : 'true'); array_push($config, 'tls-verification=' . ($tlsSettings['allowInsecure'] ? 'false' : 'true'));
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName'])) if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
array_push($config, "sni={$tlsSettings['serverName']}"); array_push($config, "tls-host={$tlsSettings['serverName']}");
} }
} }
if ($server['network'] === 'ws') { if ($server['network'] === 'ws') {

View File

@ -39,7 +39,7 @@ class Surfboard
if ($server['tlsSettings']) { if ($server['tlsSettings']) {
$tlsSettings = json_decode($server['tlsSettings'], true); $tlsSettings = json_decode($server['tlsSettings'], true);
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure'])) if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
array_push($config, 'skip-cert-verify=' . $tlsSettings['allowInsecure'] ? 'true' : 'false'); array_push($config, 'skip-cert-verify=' . ($tlsSettings['allowInsecure'] ? 'true' : 'false'));
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName'])) if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
array_push($config, "sni={$tlsSettings['serverName']}"); array_push($config, "sni={$tlsSettings['serverName']}");
} }

View File

@ -38,7 +38,7 @@ class Surge
if ($server['tlsSettings']) { if ($server['tlsSettings']) {
$tlsSettings = json_decode($server['tlsSettings'], true); $tlsSettings = json_decode($server['tlsSettings'], true);
if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure'])) if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
array_push($config, 'skip-cert-verify=' . $tlsSettings['allowInsecure'] ? 'true' : 'false'); array_push($config, 'skip-cert-verify=' . ($tlsSettings['allowInsecure'] ? 'true' : 'false'));
if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName'])) if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
array_push($config, "sni={$tlsSettings['serverName']}"); array_push($config, "sni={$tlsSettings['serverName']}");
} }