From 62a13f2da6da129b32f399307ea656121fe9598b Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Sat, 21 Jun 2025 10:16:35 +0700 Subject: [PATCH 1/3] bring back http3 support for curl --- src/SPC/builder/unix/library/curl.php | 3 ++- src/globals/ext-tests/curl.php | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/SPC/builder/unix/library/curl.php b/src/SPC/builder/unix/library/curl.php index 0d0b8d8d..c3dc7f2b 100644 --- a/src/SPC/builder/unix/library/curl.php +++ b/src/SPC/builder/unix/library/curl.php @@ -24,13 +24,14 @@ trait curl ->optionalLib('libssh2', fn ($lib) => "-DLIBSSH2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DLIBSSH2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DCURL_USE_LIBSSH2=OFF') ->optionalLib('nghttp2', fn ($lib) => "-DUSE_NGHTTP2=ON -DNGHTTP2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DNGHTTP2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DUSE_NGHTTP2=OFF') ->optionalLib('nghttp3', fn ($lib) => "-DUSE_NGHTTP3=ON -DNGHTTP3_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DNGHTTP3_INCLUDE_DIR={$lib->getIncludeDir()}", '-DUSE_NGHTTP3=OFF') + ->optionalLib('ngtcp2', fn ($lib) => "-DUSE_NGTCP2=ON -DNGNGTCP2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DNGNGTCP2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DUSE_NGTCP2=OFF') ->optionalLib('ldap', ...cmake_boolean_args('CURL_DISABLE_LDAP', true)) ->optionalLib('zstd', ...cmake_boolean_args('CURL_ZSTD')) ->optionalLib('idn2', ...cmake_boolean_args('USE_LIBIDN2')) ->optionalLib('psl', ...cmake_boolean_args('CURL_USE_LIBPSL')) ->optionalLib('libcares', '-DENABLE_ARES=ON') ->addConfigureArgs( - '-DBUILD_CURL_EXE=OFF', + '-DBUILD_CURL_EXE=ON', '-DBUILD_LIBCURL_DOCS=OFF', ) ->build(); diff --git a/src/globals/ext-tests/curl.php b/src/globals/ext-tests/curl.php index a890a8cf..2aaf1228 100644 --- a/src/globals/ext-tests/curl.php +++ b/src/globals/ext-tests/curl.php @@ -16,3 +16,6 @@ if (stripos($curl_version['ssl_version'], 'schannel') !== false) { curl_close($curl); assert($data !== false); } +if (phpversion() >= '8.2') { + assert(($curl_version['features'] & CURL_VERSION_HTTP3) === CURL_VERSION_HTTP3); +} From 8992c96014444ec64986274cfa2b5497c636b8bc Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Sat, 21 Jun 2025 10:55:06 +0700 Subject: [PATCH 2/3] remove test --- src/globals/ext-tests/curl.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/globals/ext-tests/curl.php b/src/globals/ext-tests/curl.php index 2aaf1228..a890a8cf 100644 --- a/src/globals/ext-tests/curl.php +++ b/src/globals/ext-tests/curl.php @@ -16,6 +16,3 @@ if (stripos($curl_version['ssl_version'], 'schannel') !== false) { curl_close($curl); assert($data !== false); } -if (phpversion() >= '8.2') { - assert(($curl_version['features'] & CURL_VERSION_HTTP3) === CURL_VERSION_HTTP3); -} From c464f783407e862ba5dae36986a68d31b09289db Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Sat, 21 Jun 2025 10:58:54 +0700 Subject: [PATCH 3/3] dont build exe --- src/SPC/builder/unix/library/curl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SPC/builder/unix/library/curl.php b/src/SPC/builder/unix/library/curl.php index c3dc7f2b..c38201e5 100644 --- a/src/SPC/builder/unix/library/curl.php +++ b/src/SPC/builder/unix/library/curl.php @@ -31,7 +31,7 @@ trait curl ->optionalLib('psl', ...cmake_boolean_args('CURL_USE_LIBPSL')) ->optionalLib('libcares', '-DENABLE_ARES=ON') ->addConfigureArgs( - '-DBUILD_CURL_EXE=ON', + '-DBUILD_CURL_EXE=OFF', '-DBUILD_LIBCURL_DOCS=OFF', ) ->build();