php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

uri: Use PHP_RINIT/SHUTDOWN_FUNCTION in uri_parser_whatwg (#19541)

Browse Source 
This improves discoverability of this kind of “lifecycle” helper function.
This commit is contained in:
Tim Düsterhus
2025-08-21 23:12:45 +02:00
committed by GitHub
parent 0cb3f9a3e2
commit 4a1789cc34
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/uri/php_uri.c
View File

@@ -1077,7 +1077,7 @@ static PHP_MSHUTDOWN_FUNCTION(uri)
PHP_RINIT_FUNCTION(uri)
{
if (lexbor_request_init() == FAILURE) {
if (PHP_RINIT(uri_parser_whatwg)(INIT_FUNC_ARGS_PASSTHRU) == FAILURE) {
return FAILURE;
}
@@ -1086,7 +1086,9 @@ PHP_RINIT_FUNCTION(uri)
PHP_RSHUTDOWN_FUNCTION(uri)
{
lexbor_request_shutdown();
if (PHP_RSHUTDOWN(uri_parser_whatwg)(INIT_FUNC_ARGS_PASSTHRU) == FAILURE) {
return FAILURE;
}
return SUCCESS;
}

6
ext/uri/uri_parser_whatwg.c
View File

@@ -533,7 +533,7 @@ static zend_result lexbor_write_fragment(struct uri_internal_t *internal_uri, zv
return SUCCESS;
}
zend_result lexbor_request_init(void)
PHP_RINIT_FUNCTION(uri_parser_whatwg)
{
lexbor_mraw_t *mraw = lexbor_mraw_create();
lxb_status_t status = lexbor_mraw_init(mraw, LEXBOR_MRAW_BYTE_SIZE);
@@ -554,12 +554,14 @@ zend_result lexbor_request_init(void)
return SUCCESS;
}
void lexbor_request_shutdown(void)
PHP_RSHUTDOWN_FUNCTION(uri_parser_whatwg)
{
lxb_url_parser_memory_destroy(&lexbor_parser);
lxb_url_parser_destroy(&lexbor_parser, false);
lexbor_urls = 0;
return SUCCESS;
}
lxb_url_t *lexbor_parse_uri_ex(const char *uri_str, size_t uri_str_len, const lxb_url_t *lexbor_base_url, zval *errors, bool silent)

4
ext/uri/uri_parser_whatwg.h
View File

@@ -24,7 +24,7 @@ extern const uri_parser_t lexbor_uri_parser;
lxb_url_t *lexbor_parse_uri_ex(const char *uri_str, size_t uri_str_len, const lxb_url_t *lexbor_base_url, zval *errors, bool silent);
zend_result lexbor_request_init(void);
void lexbor_request_shutdown(void);
PHP_RINIT_FUNCTION(uri_parser_whatwg);
PHP_RSHUTDOWN_FUNCTION(uri_parser_whatwg);
#endif