[php-src] master: Merge branch 'PHP-8.6'
| From: | Weilin Du | Date: | Sun, 25 Oct 2026 16:37:39 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.6' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142723@lists.php.net to get a copy of this message | ||
Author: Weilin Du (LamentXU123)
Date: 2026-10-26T00:34:16+08:00
Commit: https://github.com/php/php-src/commit/93e09753772a2a36c7b83c890c023f31656ad457
Raw diff: https://github.com/php/php-src/commit/93e09753772a2a36c7b83c890c023f31656ad457.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: Reject broken libzip versions on Windows (#24371)
Changed paths:
M ext/zip/config.w32
Diff:
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
index 44e3628270c8..8b8c7ed8f2c4 100644
--- a/ext/zip/config.w32
+++ b/ext/zip/config.w32
@@ -3,11 +3,19 @@
ARG_ENABLE("zip", "ZIP support", "yes,shared");
if (PHP_ZIP != "no") {
+ var zipconf_dir;
if (CHECK_HEADER("zip.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\include;"
+ PHP_EXTRA_INCLUDES) &&
- CHECK_HEADER("zipconf.h", "CFLAGS_ZIP", PHP_PHP_BUILD +
"\\lib\\libzip\\include;" + PHP_EXTRA_LIBS + "\\libzip\\include;" + PHP_ZIP)
&&
+ (zipconf_dir = CHECK_HEADER("zipconf.h", "CFLAGS_ZIP", PHP_PHP_BUILD +
"\\lib\\libzip\\include;" + PHP_EXTRA_LIBS + "\\libzip\\include;" + PHP_ZIP))
&&
(PHP_ZIP_SHARED && CHECK_LIB("libzip.lib", "zip", PHP_ZIP) ||
CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP) &&
CHECK_LIB("libbz2_a.lib", "zip", PHP_ZIP) &&
CHECK_LIB("zlib_a.lib;zs.lib", "zip", PHP_ZIP) &&
CHECK_LIB("liblzma_a.lib", "zip", PHP_ZIP))
) {
+ if (zipconf_dir === true) {
+ zipconf_dir = search_paths("zipconf.h",
WshShell.Environment("Process").Item("INCLUDE"), null);
+ }
+ if (GREP_HEADER("zipconf.h",
/^\s*#\s*define\s+LIBZIP_VERSION\s+"(?:1\.3\.1|1\.7\.0|1\.12(?:\.0)?)"/m, zipconf_dir)) {
+ ERROR("libzip 1.3.1, 1.7.0 and 1.12.0 are not supported. Please use another
version.");
+ }
+
EXTENSION('zip', 'php_zip.c zip_source.c zip_stream.c');
ADD_EXTENSION_DEP('zip', 'pcre');