Commit d04b03b55d5 for php.net

commit d04b03b55d56cbd4deb8c399d541d7881db9fe6e
Merge: 216edef71f9 d935e3aa3b6
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Tue Apr 7 19:11:29 2026 +0200

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      curl: add support for brotli and zstd on Windows

diff --cc NEWS
index 5fb35562c24,45d5a171d6a..5f04bdaf5cc
--- a/NEWS
+++ b/NEWS
@@@ -11,6 -8,13 +11,9 @@@ PH
    . Fixed bug GH-21478 (Forward property operations to real instance for
      initialized lazy proxies). (iliaal)

+ - Curl:
+   . Add support for brotli and zstd on Windows. (Shivam Mathur)
+
 -- DOM:
 -  . Fixed bug GH-21566 (Dom\XMLDocument::C14N() emits duplicate xmlns
 -    declarations after setAttributeNS()). (David Carlier)
 -
  - Iconv:
    . Fixed bug GH-17399 (iconv memory leak on bailout). (iliaal)

diff --cc ext/curl/config.w32
index e097a697eb5,c45d7b6bd2e..3c53bd60e5a
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@@ -9,10 -19,15 +9,13 @@@ if (PHP_CURL != "no")
  		SETUP_OPENSSL("curl", PHP_CURL) >= 2 &&
  		CHECK_LIB("winmm.lib", "curl", PHP_CURL) &&
  		CHECK_LIB("wldap32.lib", "curl", PHP_CURL) &&
 -		(((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) ||
 -			(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
 -		!isNaN(ver_num) &&
 +		SETUP_ZLIB_LIB("curl", PHP_CURL) &&
  		(CHECK_LIB("normaliz.lib", "curl", PHP_CURL) &&
  		 CHECK_LIB("libssh2.lib", "curl", PHP_CURL) &&
- 		 CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))
+ 		 CHECK_LIB("nghttp2.lib", "curl", PHP_CURL) &&
+ 		 CHECK_LIB("brotlidec.lib", "curl", PHP_CURL) &&
+ 		 CHECK_LIB("brotlicommon.lib", "curl", PHP_CURL) &&
+ 		 CHECK_LIB("libzstd.lib", "curl", PHP_CURL))
  		) {
  		EXTENSION("curl", "interface.c multi.c share.c curl_file.c");
  		AC_DEFINE('HAVE_CURL', 1, "Define to 1 if the PHP extension 'curl' is available.");