Merge branch 'PHP-8.5'

TimWolla · TimWolla · commit 3562f8114f01 · 2025-10-21T16:09:24.000+02:00
* PHP-8.5: uri: Make `php_uri_parser` structs PHPAPI (php#20243)
diff --git a/ext/uri/uri_parser_php_parse_url.c b/ext/uri/uri_parser_php_parse_url.c
@@ -165,7 +165,7 @@ static void uri_parser_php_parse_url_destroy(void *uri)
 	php_url_free(parse_url_uri);
 }
 
-const php_uri_parser php_uri_parser_php_parse_url = {
+PHPAPI const php_uri_parser php_uri_parser_php_parse_url = {
 	.name = PHP_URI_PARSER_PHP_PARSE_URL,
 	.parse = uri_parser_php_parse_url_parse,
 	.clone = NULL,
diff --git a/ext/uri/uri_parser_php_parse_url.h b/ext/uri/uri_parser_php_parse_url.h
@@ -20,6 +20,6 @@
 
 #include "php_uri_common.h"
 
-extern const php_uri_parser php_uri_parser_php_parse_url;
+PHPAPI extern const php_uri_parser php_uri_parser_php_parse_url;
 
 #endif
diff --git a/ext/uri/uri_parser_rfc3986.c b/ext/uri/uri_parser_rfc3986.c
@@ -615,7 +615,7 @@ static void php_uri_parser_rfc3986_destroy(void *uri)
 	efree(uriparser_uris);
 }
 
-const php_uri_parser php_uri_parser_rfc3986 = {
+PHPAPI const php_uri_parser php_uri_parser_rfc3986 = {
 	.name = PHP_URI_PARSER_RFC3986,
 	.parse = php_uri_parser_rfc3986_parse,
 	.clone = php_uri_parser_rfc3986_clone,
diff --git a/ext/uri/uri_parser_rfc3986.h b/ext/uri/uri_parser_rfc3986.h
@@ -19,7 +19,7 @@
 
 #include "php_uri_common.h"
 
-extern const php_uri_parser php_uri_parser_rfc3986;
+PHPAPI extern const php_uri_parser php_uri_parser_rfc3986;
 
 typedef struct php_uri_parser_rfc3986_uris php_uri_parser_rfc3986_uris;
 
diff --git a/ext/uri/uri_parser_whatwg.c b/ext/uri/uri_parser_whatwg.c
@@ -621,7 +621,7 @@ static void php_uri_parser_whatwg_destroy(void *uri)
 	lxb_url_destroy(lexbor_uri);
 }
 
-const php_uri_parser php_uri_parser_whatwg = {
+PHPAPI const php_uri_parser php_uri_parser_whatwg = {
 	.name = PHP_URI_PARSER_WHATWG,
 	.parse = php_uri_parser_whatwg_parse,
 	.clone = php_uri_parser_whatwg_clone,
diff --git a/ext/uri/uri_parser_whatwg.h b/ext/uri/uri_parser_whatwg.h
@@ -20,7 +20,7 @@
 #include "php_uri_common.h"
 #include "lexbor/url/url.h"
 
-extern const php_uri_parser php_uri_parser_whatwg;
+PHPAPI extern const php_uri_parser php_uri_parser_whatwg;
 
 lxb_url_t *php_uri_parser_whatwg_parse_ex(const char *uri_str, size_t uri_str_len, const lxb_url_t *lexbor_base_url, zval *errors, bool silent);
 

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ static void uri_parser_php_parse_url_destroy(void *uri)`
`165`	`165`	`php_url_free(parse_url_uri);`
`166`	`166`	`}`
`167`	`167`
`168`		`-const php_uri_parser php_uri_parser_php_parse_url = {`
	`168`	`+PHPAPI const php_uri_parser php_uri_parser_php_parse_url = {`
`169`	`169`	`.name = PHP_URI_PARSER_PHP_PARSE_URL,`
`170`	`170`	`.parse = uri_parser_php_parse_url_parse,`
`171`	`171`	`.clone = NULL,`
Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@ static void php_uri_parser_rfc3986_destroy(void *uri)`
`615`	`615`	`efree(uriparser_uris);`
`616`	`616`	`}`
`617`	`617`
`618`		`-const php_uri_parser php_uri_parser_rfc3986 = {`
	`618`	`+PHPAPI const php_uri_parser php_uri_parser_rfc3986 = {`
`619`	`619`	`.name = PHP_URI_PARSER_RFC3986,`
`620`	`620`	`.parse = php_uri_parser_rfc3986_parse,`
`621`	`621`	`.clone = php_uri_parser_rfc3986_clone,`
Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ static void php_uri_parser_whatwg_destroy(void *uri)`
`621`	`621`	`lxb_url_destroy(lexbor_uri);`
`622`	`622`	`}`
`623`	`623`
`624`		`-const php_uri_parser php_uri_parser_whatwg = {`
	`624`	`+PHPAPI const php_uri_parser php_uri_parser_whatwg = {`
`625`	`625`	`.name = PHP_URI_PARSER_WHATWG,`
`626`	`626`	`.parse = php_uri_parser_whatwg_parse,`
`627`	`627`	`.clone = php_uri_parser_whatwg_clone,`