Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit a28d33f60d17 · 2026-04-04T12:54:58.000+02:00
* PHP-8.4:
  Fix const-generic warning in xp_ssl.c
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -411,7 +411,7 @@ static bool php_openssl_x509_fingerprint_match(X509 *peer, zval *val)
 
 static bool php_openssl_matches_wildcard_name(const char *subjectname, const char *certname) /* {{{ */
 {
-	char *wildcard = NULL;
+	const char *wildcard = NULL;
 	ptrdiff_t prefix_len;
 	size_t suffix_len, subject_len;
 

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ static bool php_openssl_x509_fingerprint_match(X509 peer, zval val)`
`411`	`411`
`412`	`412`	`static bool php_openssl_matches_wildcard_name(const char subjectname, const char certname) /* {{{ */`
`413`	`413`	`{`
`414`		`- char *wildcard = NULL;`
	`414`	`+ const char *wildcard = NULL;`
`415`	`415`	`ptrdiff_t prefix_len;`
`416`	`416`	`size_t suffix_len, subject_len;`
`417`	`417`