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

Author: Shivam Mathur (shivammathur) Date: 2026-10-22T22:18:26+05:30 Commit: https://github.com/php/php-src/commit/9080c462d5cb7b80c3e2cd07ebbdeb06bb6c5a1a Raw diff: https://github.com/php/php-src/commit/9080c462d5cb7b80c3e2cd07ebbdeb06bb6c5a1a.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: Fix GH-24533: Accept z.lib from zlib 1.3.2 CMake builds on Windows (#24539) Changed paths: M NEWS M ext/zip/config.w32 M ext/zlib/config.w32 M win32/build/confutils.js Diff: diff --git a/NEWS b/NEWS index ef48a0ef47b7..580bb240df90 100644 --- a/NEWS +++ b/NEWS @@ -134,6 +134,8 @@ PHP NEWS - Zlib: . Fixed use-after-free when an error handler removes a failing zlib.inflate filter (GH-24176). (Edmond) + . Fixed bug GH-24533 (zlib.lib could not be found because zlib 1.3.2 + CMake build does not emit it). (Lazizbek Ergashev) 22 Oct 2026, PHP 8.5.12 diff --git a/ext/zip/config.w32 b/ext/zip/config.w32 index c0226f897646..6f0644baaf99 100644 --- a/ext/zip/config.w32 +++ b/ext/zip/config.w32 @@ -6,7 +6,7 @@ if (PHP_ZIP != "no") { if (CHECK_HEADER_ADD_INCLUDE("zip.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\include;" + PHP_EXTRA_INCLUDES) && CHECK_HEADER_ADD_INCLUDE("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", "zip", PHP_ZIP) && CHECK_LIB("liblzma_a.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)) ) { EXTENSION('zip', 'php_zip.c zip_stream.c'); ADD_EXTENSION_DEP('zip', 'pcre'); diff --git a/ext/zlib/config.w32 b/ext/zlib/config.w32 index 3bc24d88e173..7a743818dcda 100644 --- a/ext/zlib/config.w32 +++ b/ext/zlib/config.w32 @@ -3,7 +3,7 @@ ARG_ENABLE("zlib", "ZLIB support", "yes"); if (PHP_ZLIB == "yes") { - if (CHECK_LIB("zlib_a.lib;zlib.lib", "zlib", PHP_ZLIB) && + if (CHECK_LIB("zlib_a.lib;zlib.lib;zs.lib;z.lib", "zlib", PHP_ZLIB) && CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS", "..\\zlib;" + php_usual_include_suspects)) { EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", PHP_ZLIB_SHARED, "/D ZLIB_EXPORTS /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); diff --git a/win32/build/confutils.js b/win32/build/confutils.js index cea1368b4de3..091037f24e4e 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3654,7 +3654,7 @@ function ADD_MAKEFILE_FRAGMENT(src_file) function SETUP_ZLIB_LIB(target, path_to_check) { - return (PHP_ZLIB != "no" && !PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib;zlib.lib", target, path_to_check); + return (PHP_ZLIB != "no" && !PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib;zlib.lib;zs.lib;z.lib", target, path_to_check); } function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part, add_to_flag_only)