From 5d4502a14a7cb3e8ff480395d34a10bac8a42987 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Thu, 20 Nov 2025 11:46:21 +0800 Subject: [PATCH 1/9] =?UTF-8?q?swoole=20=E5=90=AF=E7=94=A8=E6=94=AF?= =?UTF-8?q?=E6=8C=81ssh2=20=E5=8D=8F=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapi/SWOOLE-VERSION.conf | 2 +- sapi/src/builder/extension/swoole.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sapi/SWOOLE-VERSION.conf b/sapi/SWOOLE-VERSION.conf index 035fbdc6e7..1f7391f92b 100644 --- a/sapi/SWOOLE-VERSION.conf +++ b/sapi/SWOOLE-VERSION.conf @@ -1 +1 @@ -v6.1.1 +master diff --git a/sapi/src/builder/extension/swoole.php b/sapi/src/builder/extension/swoole.php index 4abadd4139..b1920c864b 100644 --- a/sapi/src/builder/extension/swoole.php +++ b/sapi/src/builder/extension/swoole.php @@ -6,7 +6,8 @@ return function (Preprocessor $p) { $libiconv_prefix = ICONV_PREFIX; - $dependentLibraries = ['curl', 'openssl', 'cares', 'zlib', 'brotli', 'nghttp2', 'sqlite3', 'unix_odbc', 'pgsql', 'libzstd']; + $libssh2_prefix = LIBSSH2_PREFIX; + $dependentLibraries = ['curl', 'openssl', 'cares', 'zlib', 'brotli', 'nghttp2', 'sqlite3', 'unix_odbc', 'pgsql', 'libzstd', 'libssh2']; $dependentExtensions = ['curl', 'openssl', 'sockets', 'mysqlnd', 'pdo']; $options[] = '--enable-swoole'; @@ -23,6 +24,7 @@ $options[] = '--enable-brotli'; $options[] = '--enable-zstd'; $options[] = '--enable-swoole-stdext'; + $options[] = '--with-swoole-ssh2=' . $libssh2_prefix; if ($p->isLinux() && $p->getInputOption('with-iouring')) { $options[] = '--enable-iouring'; From f8ba0e012ef6bd2707299e65c368ab0043d31d62 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Thu, 20 Nov 2025 13:13:07 +0800 Subject: [PATCH 2/9] =?UTF-8?q?cygwin=20=E7=8E=AF=E5=A2=83=E4=B8=8B=20swoo?= =?UTF-8?q?le=20=E5=90=AF=E7=94=A8=E6=94=AF=E6=8C=81=20ssh2=20=E5=8D=8F?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapi/quickstart/windows/cygwin-build/install-cygwin.bat | 1 + sapi/scripts/cygwin/cygwin-config.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/sapi/quickstart/windows/cygwin-build/install-cygwin.bat b/sapi/quickstart/windows/cygwin-build/install-cygwin.bat index f4b984968f..04a5257744 100644 --- a/sapi/quickstart/windows/cygwin-build/install-cygwin.bat +++ b/sapi/quickstart/windows/cygwin-build/install-cygwin.bat @@ -53,6 +53,7 @@ set "PACKAGES=%PACKAGES%,flex" set "PACKAGES=%PACKAGES%,cygwin-devel,libnet6-devel" set "PACKAGES=%PACKAGES%,libwrap-devel" set "PACKAGES=%PACKAGES%,libedit-devel" +set "PACKAGES=%PACKAGES%,libssh2-devel" set "OPTIONS=%OPTIONS% --packages %PACKAGES%" diff --git a/sapi/scripts/cygwin/cygwin-config.sh b/sapi/scripts/cygwin/cygwin-config.sh index b9be3798b7..d396813cce 100755 --- a/sapi/scripts/cygwin/cygwin-config.sh +++ b/sapi/scripts/cygwin/cygwin-config.sh @@ -57,6 +57,7 @@ test -f Makefile && make clean --enable-brotli \ --enable-zstd \ --enable-swoole-stdext \ + --with-swoole-ssh2 \ --enable-redis \ --with-imagick \ --with-yaml \ From e0cfc79907d07024408ff769d324d80bf0d5abf5 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Sun, 15 Mar 2026 20:40:36 +0800 Subject: [PATCH 3/9] swoole switch to v6.2.0 --- sapi/SWOOLE-VERSION.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/SWOOLE-VERSION.conf b/sapi/SWOOLE-VERSION.conf index 1f7391f92b..2dc8e03bce 100644 --- a/sapi/SWOOLE-VERSION.conf +++ b/sapi/SWOOLE-VERSION.conf @@ -1 +1 @@ -master +v6.2.0 From d26e62a43962e93dce3d6ac226875b26cc196f81 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Sun, 15 Mar 2026 20:45:16 +0800 Subject: [PATCH 4/9] update liburing version --- sapi/src/builder/library/liburing.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/src/builder/library/liburing.php b/sapi/src/builder/library/liburing.php index b04207fb50..7cf0db211b 100644 --- a/sapi/src/builder/library/liburing.php +++ b/sapi/src/builder/library/liburing.php @@ -10,7 +10,7 @@ ->withHomePage('https://github.com/axboe/liburing.git') ->withLicense('https://github.com/axboe/liburing/blob/master/COPYING', Library::LICENSE_LGPL) ->withManual('hhttps://github.com/axboe/liburing') - ->withUrl('https://github.com/axboe/liburing/archive/refs/tags/liburing-2.6.tar.gz') + ->withUrl('https://github.com/axboe/liburing/archive/refs/tags/liburing-2.14.tar.gz') ->withPrefix($liburing_prefix) ->withConfigure( << Date: Wed, 18 Mar 2026 15:02:13 +0800 Subject: [PATCH 5/9] =?UTF-8?q?swoole=20=E5=90=AF=E7=94=A8=E6=94=AF?= =?UTF-8?q?=E6=8C=81ftp=20=E5=8D=8F=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapi/src/builder/extension/swoole.php | 1 + 1 file changed, 1 insertion(+) diff --git a/sapi/src/builder/extension/swoole.php b/sapi/src/builder/extension/swoole.php index 9e21f0f640..a59afe832f 100644 --- a/sapi/src/builder/extension/swoole.php +++ b/sapi/src/builder/extension/swoole.php @@ -25,6 +25,7 @@ $options[] = '--enable-zstd'; $options[] = '--enable-swoole-stdext'; $options[] = '--with-swoole-ssh2=' . $libssh2_prefix; + $options[] = '--enable-swoole-ftp' . $libssh2_prefix; if ($p->isLinux() && $p->getInputOption('with-iouring')) { $options[] = '--enable-iouring'; From 4bd44ea0e652e780b2db657026e6386916825d2c Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Wed, 18 Mar 2026 15:06:03 +0800 Subject: [PATCH 6/9] =?UTF-8?q?swoole=20=E5=90=AF=E7=94=A8=E6=94=AF?= =?UTF-8?q?=E6=8C=81ftp=20=E5=8D=8F=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapi/scripts/cygwin/cygwin-config.sh | 1 + sapi/scripts/msys2/config.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sapi/scripts/cygwin/cygwin-config.sh b/sapi/scripts/cygwin/cygwin-config.sh index 994edd3417..ffe9cb94c3 100755 --- a/sapi/scripts/cygwin/cygwin-config.sh +++ b/sapi/scripts/cygwin/cygwin-config.sh @@ -59,6 +59,7 @@ test -f Makefile && make clean --enable-zstd \ --enable-swoole-stdext \ --with-swoole-ssh2 \ + --enable-swoole-ftp \ --enable-redis \ --with-imagick \ --with-yaml \ diff --git a/sapi/scripts/msys2/config.sh b/sapi/scripts/msys2/config.sh index 39bdeda756..cc5ee86cf4 100644 --- a/sapi/scripts/msys2/config.sh +++ b/sapi/scripts/msys2/config.sh @@ -84,6 +84,8 @@ test -f Makefile && make clean --enable-brotli \ --enable-zstd \ --enable-swoole-stdext \ + --with-swoole-ssh2 \ + --enable-swoole-ftp \ --enable-redis \ --enable-opcache \ --disable-opcache-jit \ From 612027962cd5c6fdf49d82c0c8b07fd8e76ac8e2 Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Wed, 18 Mar 2026 19:08:47 +0800 Subject: [PATCH 7/9] fix swoole config error --- sapi/src/builder/extension/swoole.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/src/builder/extension/swoole.php b/sapi/src/builder/extension/swoole.php index a59afe832f..63240fb1f1 100644 --- a/sapi/src/builder/extension/swoole.php +++ b/sapi/src/builder/extension/swoole.php @@ -25,7 +25,7 @@ $options[] = '--enable-zstd'; $options[] = '--enable-swoole-stdext'; $options[] = '--with-swoole-ssh2=' . $libssh2_prefix; - $options[] = '--enable-swoole-ftp' . $libssh2_prefix; + $options[] = '--enable-swoole-ftp'; if ($p->isLinux() && $p->getInputOption('with-iouring')) { $options[] = '--enable-iouring'; From 613bf4ab3dfa34987b34508f3e14909f714778ed Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Wed, 18 Mar 2026 22:06:16 +0800 Subject: [PATCH 8/9] fix glibc build environment error --- .github/workflows/linux-glibc.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-glibc.yml b/.github/workflows/linux-glibc.yml index 28e9b59f78..bffa5be457 100644 --- a/.github/workflows/linux-glibc.yml +++ b/.github/workflows/linux-glibc.yml @@ -102,8 +102,8 @@ jobs: php prepare.php --with-libavif sudo apt update - bash ./sapi/scripts/install-deps-on-ubuntu.sh - bash ./ext/swoole/scripts/install-deps-on-ubuntu.sh + sudo bash ./sapi/scripts/install-deps-on-ubuntu.sh + sudo bash ./ext/swoole/scripts/install-deps-on-ubuntu.sh bash ./sapi/scripts/build-swoole-cli-with-linux-gcc.sh ./bin/swoole-cli -v From 04234fbd35d51e15a800016569675e112247569d Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Wed, 18 Mar 2026 22:48:38 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E8=84=9A=E6=9C=AC=20=E6=B7=BB=E5=8A=A0=20=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=20box.phar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup-php-runtime.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup-php-runtime.sh b/setup-php-runtime.sh index 17931779a1..9ecf7630d6 100644 --- a/setup-php-runtime.sh +++ b/setup-php-runtime.sh @@ -68,6 +68,7 @@ APP_DOWNLOAD_URL="https://github.com/swoole/swoole-cli/releases/download/${VERSI COMPOSER_DOWNLOAD_URL="https://getcomposer.org/download/latest-stable/composer.phar" CACERT_DOWNLOAD_URL="https://curl.se/ca/cacert.pem" PIE_DOWNLOAD_URL="https://github.com/php/pie/releases/download/${PIE_VERSION}/pie.phar" +BOX_DOWNLOAD_URL="https://github.com/box-project/box/releases/latest/download/box.phar" if [ $OS = 'windows' ]; then APP_DOWNLOAD_URL="https://github.com/swoole/swoole-cli/releases/download/${VERSION}/${APP_NAME}-${APP_VERSION}-cygwin-${ARCH}.zip" @@ -122,6 +123,9 @@ chmod a+x composer.phar test -f pie.phar || curl -fSLo pie.phar ${PIE_DOWNLOAD_URL} chmod a+x pie.phar +test -f box.phar || curl -fSLo box.phar ${BOX_DOWNLOAD_URL} +chmod a+x box.phar + test -f cacert.pem || curl -fSLo cacert.pem ${CACERT_DOWNLOAD_URL} APP_RUNTIME="${APP_NAME}-${APP_VERSION}-${OS}-${ARCH}" @@ -149,6 +153,7 @@ cd ${__PROJECT__}/var/runtime cp -f ${__PROJECT__}/var/runtime/composer.phar ${APP_RUNTIME_DIR}/composer cp -f ${__PROJECT__}/var/runtime/cacert.pem ${APP_RUNTIME_DIR}/cacert.pem cp -f ${__PROJECT__}/var/runtime/pie.phar ${APP_RUNTIME_DIR}/pie +cp -f ${__PROJECT__}/var/runtime/box.phar ${APP_RUNTIME_DIR}/box cat >${APP_RUNTIME_DIR}/php.ini <