Commit 9e769f0a41b for php

commit 9e769f0a41b9b14a51e4d6759d95516c1f44c96f
Merge: acdb154f210 9080c462d5c
Author: Shivam Mathur <shivam_jpr@hotmail.com>
Date:   Thu Oct 22 22:18:52 2026 +0530

    Merge branch 'PHP-8.5' into PHP-8.6

    * PHP-8.5:
      Fix GH-24533: Accept z.lib from zlib 1.3.2 CMake builds on Windows (#24539)

diff --cc NEWS
index 4f69e30d6f1,580bb240df9..ec219f117b2
--- a/NEWS
+++ b/NEWS
@@@ -1,28 -1,8 +1,32 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 8.5.13
 +?? ??? ????, PHP 8.6.0RC5
 +
 +- Opcache:
 +  . Fixed tracing JIT returning a wrapped integer instead of a float on
 +    integer overflow after an integer was compared with a float or
 +    numeric-string literal. (Ilia Alshanetsky)
 +
 +- PDO_PGSQL:
 +  . Fixed bug GH-24461 (DISCARD ALL on persistent connection cleanup drops
 +    PgBouncer's prepared statements). (David Carlier, Artem Ukrainskiy)
 +
 +- Streams:
 +  . Fixed bug GH-24506 (stream_select() leaks a stream-error operation level
 +    on its FD_SETSIZE failure path). (azjezz)
 +  . Fixed bug GH-24508 (HTTP wrapper leaks the dechunk filter when header
 +    parsing fails after Transfer-Encoding). (bercedev)
 +
++- Zlib:
++  . Fixed bug GH-24533 (zlib.lib could not be found because zlib 1.3.2
++    CMake build does not emit it). (Lazizbek Ergashev)
++
 +21 Oct 2026, PHP 8.6.0RC4

  - Core:
 +  . Fixed GHSA-w8hw-w9fx-j79w, GHSA-6wmf-4rv5-p3rp (Avoid state corruption via
 +    bailout). (CVE-2026-109618, CVE-2026-109619) (Arnaud, ilutov, Jakub Zelenka,
 +    ndossche, Nicolas Grekas)
    . Fixed bug GH-24184 (System ID not being reinitialized after an Apache
      graceful restart, potentially causing incompatible OPcache file cache
      entries to be reused). (Levi Morrison)
diff --cc ext/zip/config.w32
index 8dd22c7761c,6f0644baaf9..44e3628270c
--- a/ext/zip/config.w32
+++ b/ext/zip/config.w32
@@@ -3,12 -3,12 +3,12 @@@
  ARG_ENABLE("zip", "ZIP support", "yes,shared");

  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) &&
 +	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) &&
  		(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');
 +		EXTENSION('zip', 'php_zip.c zip_source.c zip_stream.c');
  		ADD_EXTENSION_DEP('zip', 'pcre');

  		if (get_define("LIBS_ZIP").match("libzip_a(?:_debug)?\.lib")) {
diff --cc ext/zlib/config.w32
index 520ab11cd84,7a743818dcd..8048d520619
--- a/ext/zlib/config.w32
+++ b/ext/zlib/config.w32
@@@ -3,10 -3,10 +3,10 @@@
  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)) {
 +		CHECK_HEADER("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");
 +		EXTENSION("zlib", "zlib.c zlib_fopen_wrapper.c zlib_filter.c", PHP_ZLIB_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
  		AC_DEFINE("HAVE_ZLIB", 1, "Define to 1 if the PHP extension 'zlib' is available.");

  		if (!PHP_ZLIB_SHARED) {
diff --cc win32/build/confutils.js
index 7d9297e8c2d,091037f24e4..e3dbe97e367
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@@ -3732,10 -3654,10 +3732,10 @@@ 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)
 +function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part)
  {
  	var ret = 0;
  	var cflags_var = "CFLAGS_" + target.toUpperCase();