[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
| From: | Weilin Du | Date: | Sun, 25 Oct 2026 14:02:23 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142714@lists.php.net to get a copy of this message | ||
Author: Weilin Du (LamentXU123)
Date: 2026-10-25T21:56:40+08:00
Commit: https://github.com/php/php-src/commit/19a386ec1cf341003cfd54975e81fc0366a9549f
Raw diff: https://github.com/php/php-src/commit/19a386ec1cf341003cfd54975e81fc0366a9549f.diff
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Merge branch 'PHP-8.4' into PHP-8.5
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 1d89beaec1ae..25d63d6a6d51 100644
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,10 @@ PHP NEWS
. Fixed bug GH-24509 (HTTP wrapper leaks Location buffer on empty
Location header). (bercedev)
+- Zip:
+ . Excluded libzip 1.12.0 due to a regression preventing additions and
+ replacements in torrentzip archives. (Weilin Du)
+
- Zlib:
. Fixed bug GH-24533 (zlib.lib could not be found because zlib 1.3.2
CMake build does not emit it). (Lazizbek Ergashev)
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])