From 69d32e0fd9e3400649b30bf7d8161960d250f89a Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Thu, 20 Nov 2025 08:44:09 +0800 Subject: [PATCH 1/3] merge code conflict --- sapi/src/template/make.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sapi/src/template/make.php b/sapi/src/template/make.php index 2fc43e8852..319208a75e 100755 --- a/sapi/src/template/make.php +++ b/sapi/src/template/make.php @@ -300,13 +300,8 @@ { ldd getWorkDir() ?>/bin/swoole-cli ; } || { echo $? ; } file getWorkDir() ?>/bin/swoole-cli readelf -h getWorkDir() ?>/bin/swoole-cli -<<<<<<< HEAD - # { readelf -l getWorkDir() ?>/bin/swoole-cli ; } || { echo $? ; } - # { objdump -p getWorkDir() ?>/bin/swoole-cli ; } || { echo $? ; } -======= { readelf -l getWorkDir() ?>/bin/swoole-cli ; } || { echo $? ; } { objdump -p getWorkDir() ?>/bin/swoole-cli ; } || { echo $? ; } ->>>>>>> feature-linux-static-pie } From fe47233fe7c06e8a676d8986f1fdec32ff4446e9 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Thu, 20 Nov 2025 08:52:23 +0800 Subject: [PATCH 2/3] upgrade apcu to support php 8.4 --- ext/readline/readline_cli.c | 18 +----------------- sapi/src/builder/extension/apcu.php | 4 ++-- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c index 312129991c..673e2d992a 100644 --- a/ext/readline/readline_cli.c +++ b/ext/readline/readline_cli.c @@ -739,24 +739,8 @@ typedef cli_shell_callbacks_t *(__cdecl *get_cli_shell_callbacks)(void); } while(0) #else -/* -#ifdef COMPILE_DL_READLINE -This dlsym() is always used as even the CGI SAPI is linked against "CLI"-only -extensions. If that is being changed dlsym() should only be used when building -this extension sharedto offer compatibility. -*/ -#define GET_SHELL_CB(cb) \ - do { \ - (cb) = NULL; \ - cli_shell_callbacks_t *(*get_callbacks)(void); \ - get_callbacks = dlsym(RTLD_DEFAULT, "php_cli_get_shell_callbacks"); \ - if (get_callbacks) { \ - (cb) = get_callbacks(); \ - } \ - } while(0) -/*#else #define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks() -#endif*/ + #endif PHP_MINIT_FUNCTION(cli_readline) diff --git a/sapi/src/builder/extension/apcu.php b/sapi/src/builder/extension/apcu.php index 2e55edd44a..9c08c2e5a2 100644 --- a/sapi/src/builder/extension/apcu.php +++ b/sapi/src/builder/extension/apcu.php @@ -7,8 +7,8 @@ $p->addExtension( (new Extension('apcu')) ->withOptions('--enable-apcu') - ->withPeclVersion('5.1.22') - ->withFileHash('md5', '2e1fb1f09725ada616e873c4e4012ff6') + ->withPeclVersion('5.1.27') + ->withFileHash('md5', '2f8c0244d31aabfb9cf68695764398f0') ->withHomePage('https://github.com/krakjoe/apcu.git') ->withManual('https://www.php.net/apcu') ->withLicense('https://github.com/krakjoe/apcu/blob/master/LICENSE', Extension::LICENSE_PHP) From cb62410c54949eebbd7ea6b96e1260835715c2ce Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Thu, 20 Nov 2025 09:25:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=89=A9=E5=B1=95ds=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapi/src/builder/extension/ds.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sapi/src/builder/extension/ds.php b/sapi/src/builder/extension/ds.php index 0c935b7055..5b2f47e199 100644 --- a/sapi/src/builder/extension/ds.php +++ b/sapi/src/builder/extension/ds.php @@ -7,8 +7,8 @@ $p->addExtension( (new Extension('ds')) ->withOptions(' --enable-ds') - ->withPeclVersion('1.4.0') - ->withFileHash('md5', 'd7e64fbb53b567908d63155ec2a8f548') + ->withPeclVersion('1.6.0') + ->withFileHash('md5', 'c743b75f58bedfa2ab7fb3853b7b629b') ->withHomePage('https://github.com/php-ds/ext-ds') ->withManual('https://www.php.net/ds') ->withLicense('https://github.com/php-ds/ext-ds/blob/master/LICENSE', Extension::LICENSE_MIT)