Commit c288b40bb99 for php.net

commit c288b40bb99e1d03afe26f26d6568e9b660c9025
Merge: 71eff1084eb 6e90c020384
Author: Shivam Mathur <shivam_jpr@hotmail.com>
Date:   Wed May 20 19:43:48 2026 +0530

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      Make curl brotli and zstd optional on Windows (#21925)

diff --cc ext/curl/config.w32
index 3c53bd60e5a,7d336b4fae9..4f8e344840d
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@@ -6,19 -6,39 +6,26 @@@ if (PHP_CURL != "no")
  	var curl_location;
  	if ((curl_location = CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL)) &&
  		CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") &&
 -		SETUP_OPENSSL("curl", PHP_CURL) > 0 &&
 +		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) &&
 -		(ver_num <= parseInt("0x073b00") || ver_num > parseInt("0x073b00") &&
 -			CHECK_LIB("normaliz.lib", "curl", PHP_CURL) &&
 -			CHECK_LIB("libssh2.lib", "curl", PHP_CURL) &&
 -			CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))
 +		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("brotlidec.lib", "curl", PHP_CURL) &&
- 		 CHECK_LIB("brotlicommon.lib", "curl", PHP_CURL) &&
- 		 CHECK_LIB("libzstd.lib", "curl", PHP_CURL))
++		 CHECK_LIB("nghttp2.lib", "curl", PHP_CURL))
  		) {
+ 		if (!(CHECK_HEADER_ADD_INCLUDE("brotli/decode.h", "CFLAGS_CURL") &&
+ 			CHECK_LIB("brotlidec.lib;brotlidec-static.lib", "curl", PHP_CURL) &&
+ 			CHECK_LIB("brotlicommon.lib;brotlicommon-static.lib", "curl", PHP_CURL)
+ 		)) {
+ 			WARNING("brotli in curl not enabled; libraries or headers not found");
+ 		}
+ 		if (!(CHECK_LIB("libzstd.lib;libzstd_a.lib", "curl", PHP_CURL)
+ 		)) {
+ 			WARNING("zstd in curl not enabled; library not found");
+ 		}
  		EXTENSION("curl", "interface.c multi.c share.c curl_file.c");
 -		AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
 +		AC_DEFINE('HAVE_CURL', 1, "Define to 1 if the PHP extension 'curl' is available.");
  		ADD_FLAG("CFLAGS_CURL", "/D PHP_CURL_EXPORTS=1");
  		if (curl_location.match(/libcurl_a\.lib$/)) {
  			ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");