From e7fe91faef6e8e3761a07ddfafad73d360489926 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 3 Aug 2025 01:23:47 +0800 Subject: [PATCH] Fix patch, use pure socket client directly --- src/SPC/store/SourcePatcher.php | 3 ++- src/globals/ext-tests/openssl.php | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/SPC/store/SourcePatcher.php b/src/SPC/store/SourcePatcher.php index 1eed5595..1f00db68 100644 --- a/src/SPC/store/SourcePatcher.php +++ b/src/SPC/store/SourcePatcher.php @@ -87,10 +87,11 @@ class SourcePatcher } // patch configure.ac + $musl = SPCTarget::getLibc() === 'musl'; FileSystem::replaceFileStr( SOURCE_PATH . '/php-src/configure.ac', 'if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1', - 'if [ "$SPC_LIBC" = "musl" ];' + 'if ' . ($musl ? 'true' : 'false') ); if (getenv('SPC_LIBC') === false && ($libc = SPCTarget::getLibc()) !== null) { putenv("SPC_LIBC={$libc}"); diff --git a/src/globals/ext-tests/openssl.php b/src/globals/ext-tests/openssl.php index 189c222e..c687d0fc 100644 --- a/src/globals/ext-tests/openssl.php +++ b/src/globals/ext-tests/openssl.php @@ -6,14 +6,25 @@ assert(function_exists('openssl_digest')); assert(openssl_digest('123456', 'md5') === 'e10adc3949ba59abbe56e057f20f883e'); if (file_exists('/etc/ssl/openssl.cnf')) { $domain_list = [ - 'https://captive.apple.com/', - 'https://detectportal.firefox.com/', - 'https://static-php.dev/', - 'https://www.example.com/', + 'captive.apple.com', + 'detectportal.firefox.com', + 'static-php.dev', + 'www.example.com', ]; $valid = false; foreach ($domain_list as $domain) { - if (file_get_contents($domain) !== false) { + $ssloptions = [ + 'capture_peer_cert' => true, + 'capture_peer_cert_chain' => true, + 'allow_self_signed' => false, + 'CN_match' => $domain, + 'verify_peer' => true, + 'SNI_enabled' => true, + 'SNI_server_name' => $domain, + ]; + $context = stream_context_create(['ssl' => $ssloptions]); + $result = stream_socket_client("ssl://{$domain}:443", $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $context); + if ($result !== false) { $valid = true; break; }