Merge branch 'PHP-8.4' into PHP-8.5

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

Author: iluuu1994

NEWS

@@ -11,6 +11,9 @@ PHP                                                                        NEWS
   . 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)
+
 - Iconv:
   . Fixed bug GH-17399 (iconv memory leak on bailout). (iliaal)
 

ext/curl/config.w32

@@ -12,7 +12,10 @@ if (PHP_CURL != "no") {
 		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.");

ext/curl/tests/check_win_config.phpt

@@ -47,11 +47,11 @@ UNIX_SOCKETS => %r(Yes|No)%r
 PSL => No
 HTTPS_PROXY => Yes
 MULTI_SSL => %s
-BROTLI => %s
+BROTLI => Yes
 ALTSVC => Yes
 HTTP3 => No
 UNICODE => No
-ZSTD => No
+ZSTD => Yes
 HSTS => Yes
 GSASL => No
 Protocols => dict, file, ftp, ftps, gopher, %r(gophers, )?%rhttp, https, imap, imaps, ldap, ldaps, %r(mqtt, )?%rpop3, pop3s, rtsp, scp, sftp, smb, smbs, smtp, smtps, telnet, tftp%r(, ws)?(, wss)?%r