Skip to content

[pull] master from php:master #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Oct 21, 2025
Merged

[pull] master from php:master #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79a5804
uri: Make `php_uri_parser` structs PHPAPI (#20243)
TimWolla Oct 21, 2025
3562f81
Merge branch 'PHP-8.5'
TimWolla Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/uri/uri_parser_php_parse_url.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ext/uri/uri_parser_php_parse_url.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ext/uri/uri_parser_rfc3986.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ext/uri/uri_parser_rfc3986.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ext/uri/uri_parser_whatwg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ext/uri/uri_parser_whatwg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down