Commit 9080c462d5c for php

commit 9080c462d5cb7b80c3e2cd07ebbdeb06bb6c5a1a
Merge: 674f99894a6 3d3d3665a73
Author: Shivam Mathur <shivam_jpr@hotmail.com>
Date:   Thu Oct 22 22:18:26 2026 +0530

    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)

diff --cc NEWS
index ef48a0ef47b,b2a90382e70..580bb240df9
--- a/NEWS
+++ b/NEWS
@@@ -134,8 -146,10 +134,10 @@@ PH
  - 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.4.27
 +22 Oct 2026, PHP 8.5.12

  - Core:
    . Fixed GHSA-w8hw-w9fx-j79w, GHSA-6wmf-4rv5-p3rp (Avoid state corruption via
diff --cc win32/build/confutils.js
index cea1368b4de,66c5c5be758..091037f24e4
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@@ -3652,11 -3629,6 +3652,11 @@@ 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)
  {
  	var ret = 0;