[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5

From: Date: Sun, 25 Oct 2026 14:02:23 +0000
Subject: [php-src] master: Merge branch 'PHP-8.4' into PHP-8.5
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-142715@lists.php.net to get a copy of this message
Author: Weilin Du (LamentXU123) Date: 2026-10-25T21:55:59+08:00 Commit: https://github.com/php/php-src/commit/5d32ef2a6f4ca60a0170526c50e3d08c2d0e29f1 Raw diff: https://github.com/php/php-src/commit/5d32ef2a6f4ca60a0170526c50e3d08c2d0e29f1.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: ext/zip: Exclude broken libzip 1.12 (#24358) Changed paths: M NEWS M ext/zip/config.m4 Diff: diff --git a/NEWS b/NEWS index 4513b51b8684..c4d5d12def1b 100644 --- a/NEWS +++ b/NEWS @@ -161,6 +161,8 @@ PHP NEWS tidy::repairFile() rejecting null for $encoding. (lacatoire) - Zip: + . Excluded libzip 1.12.0 due to a regression preventing additions and + replacements in torrentzip archives. (Weilin Du) . Fixed use-after-free when re-entering ZipArchive during destruction or a close warning, and rejected opening streams while closing. (jvoisin) . Fixed a use-after-free when a ZipArchive method that modifies the archive diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 643397c19721..d0fbb4d856d8 100644 --- a/ext/zip/config.m4 +++ b/ext/zip/config.m4 @@ -4,7 +4,7 @@ PHP_ARG_WITH([zip], [Include Zip read/write support])]) if test "$PHP_ZIP" != "no"; then - PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0]) + PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0]) PHP_EVAL_INCLINE([$LIBZIP_CFLAGS]) PHP_EVAL_LIBLINE([$LIBZIP_LIBS], [ZIP_SHARED_LIBADD])

« previous php.cvs (#142715) next »