Commit 6fe086a4ca2 for php.net

commit 6fe086a4ca23383887c0ebb76eaf00d0a88f6f9b
Merge: cbf65984c4f 1088c7de1a2
Author: Shivam Mathur <shivam_jpr@hotmail.com>
Date:   Wed May 20 19:30:40 2026 +0530

    Merge branch 'PHP-8.2' into PHP-8.3

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

diff --cc ext/curl/config.w32
index 351051eb6b1,14ae1a28ab1..6c04bddef5d
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@@ -25,17 -24,21 +25,24 @@@ if (PHP_CURL != "no")
  		(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) &&
- 			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');
 -		ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB /D PHP_CURL_EXPORTS=1");
 +		ADD_FLAG("CFLAGS_CURL", "/D PHP_CURL_EXPORTS=1");
 +		if (curl_location.match(/libcurl_a\.lib$/)) {
 +			ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");
 +		}
  		PHP_INSTALL_HEADERS("ext/curl", "php_curl.h");
  		// TODO: check for curl_version_info
  	} else {