[php-src] master: Merge branch 'PHP-8.6'

From: Date: Sun, 25 Oct 2026 14:02:33 +0000
Subject: [php-src] master: Merge branch 'PHP-8.6'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-142716@lists.php.net to get a copy of this message
Author: Weilin Du (LamentXU123) Date: 2026-10-25T21:57:33+08:00 Commit: https://github.com/php/php-src/commit/b6590244b91390c5e8c7d069c4a8e77de1ed2a43 Raw diff: https://github.com/php/php-src/commit/b6590244b91390c5e8c7d069c4a8e77de1ed2a43.diff Merge branch 'PHP-8.6' * PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6 Merge branch 'PHP-8.4' into PHP-8.5 ext/zip: Exclude broken libzip 1.12 (#24358) Changed paths: M ext/zip/config.m4 Diff: diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 index 590be44f6501..2fd1145da06c 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 >= 1.0.0 libzip != 1.3.1 libzip != 1.7.0]) + PKG_CHECK_MODULES([LIBZIP], [libzip >= 1.0.0 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 (#142716) next »